support: Add xsetlocale function

Message ID 20191111143946.GA5229@aloka.lostca.se
State New
Headers show
Series
  • support: Add xsetlocale function
Related show

Commit Message

Arjun Shankar Nov. 11, 2019, 2:39 p.m.
From: Arjun Shankar <arjun@redhat.com>

---
 support/Makefile     |  1 +
 support/support.h    |  1 +
 support/xsetlocale.c | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 support/xsetlocale.c

Comments

Florian Weimer Nov. 11, 2019, 3:05 p.m. | #1
* Arjun Shankar:

> diff --git a/support/Makefile b/support/Makefile

> index a6081bba98..21a27cf863 100644

> --- a/support/Makefile

> +++ b/support/Makefile

> @@ -169,6 +169,7 @@ libsupport-routines = \

>    xunlink \

>    xwaitpid \

>    xwrite \

> +  xsetlocale \

>  

>  libsupport-static-only-routines := $(libsupport-routines)

>  # Only build one variant of the library.


Please keep the list of files sorted alphabetically.  Rest looks okay to
me.

Thanks,
Florian

Patch

diff --git a/support/Makefile b/support/Makefile
index a6081bba98..21a27cf863 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -169,6 +169,7 @@  libsupport-routines = \
   xunlink \
   xwaitpid \
   xwrite \
+  xsetlocale \
 
 libsupport-static-only-routines := $(libsupport-routines)
 # Only build one variant of the library.
diff --git a/support/support.h b/support/support.h
index a9df6e9a3c..c10234404a 100644
--- a/support/support.h
+++ b/support/support.h
@@ -91,6 +91,7 @@  char *xasprintf (const char *format, ...)
   __attribute__ ((format (printf, 1, 2), malloc));
 char *xstrdup (const char *);
 char *xstrndup (const char *, size_t);
+char *xsetlocale (int category, const char *locale);
 
 /* These point to the TOP of the source/build tree, not your (or
    support's) subdirectory.  */
diff --git a/support/xsetlocale.c b/support/xsetlocale.c
new file mode 100644
index 0000000000..063ed4b0d6
--- /dev/null
+++ b/support/xsetlocale.c
@@ -0,0 +1,30 @@ 
+/* setlocale with error checking.
+   Copyright (C) 2019 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <support/check.h>
+
+#include <locale.h>
+
+char *
+xsetlocale (int category, const char *locale)
+{
+  char *p = setlocale (category, locale);
+  if (p == NULL)
+    FAIL_EXIT1 ("error: setlocale (%d, \"%s\")\n", category, locale);
+  return p;
+}