aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-02-01 16:14:15 +0000
committerUlrich Drepper <drepper@redhat.com>2007-02-01 16:14:15 +0000
commit4a44ce79c6dee9a77207466142a36caa9fa54141 (patch)
tree20a07e11954af12cf170253bbc4429e28ca928df /string
parent58a2d52e95b8c38ce43dcfbd6cce1d1ca1196c61 (diff)
downloadglibc-4a44ce79c6dee9a77207466142a36caa9fa54141.tar
glibc-4a44ce79c6dee9a77207466142a36caa9fa54141.tar.gz
glibc-4a44ce79c6dee9a77207466142a36caa9fa54141.tar.bz2
glibc-4a44ce79c6dee9a77207466142a36caa9fa54141.zip
* sysdeps/unix/sysv/linux/i386/sysdep.h (PTR_MANGLE): Roll value beforecvs/fedora-glibc-20070202T0923
returning. (PTR_DEMANGLE): Real definition now that it's not the same as PRT_MANGLE anymore. * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise. * string/strerror_l.c: New file. * string/Makefile (routines): Add strerror_l. * string/string.h: Declare strerror_l. * string/Versions: Export strerror_l for GLIBC_2.6. * nscd/connections.c (nscd_run): Don't define MAXKEYLEN here.
Diffstat (limited to 'string')
-rw-r--r--string/Makefile2
-rw-r--r--string/Versions3
-rw-r--r--string/strerror_l.c71
-rw-r--r--string/string.h8
4 files changed, 82 insertions, 2 deletions
diff --git a/string/Makefile b/string/Makefile
index f087022b3c..d4ec22457d 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -40,7 +40,7 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \
addsep replace) \
envz basename \
strcoll_l strxfrm_l string-inlines memrchr \
- xpg-strerror
+ xpg-strerror strerror_l
# Gcc internally generates calls to unbounded memcpy and memset
# for -fbounded-pointer compiles. Glibc uses memchr for explicit checks.
diff --git a/string/Versions b/string/Versions
index ee5dee903f..f145fd34a4 100644
--- a/string/Versions
+++ b/string/Versions
@@ -77,4 +77,7 @@ libc {
# x*
__xpg_strerror_r;
}
+ GLIBC_2.6 {
+ strerror_l;
+ }
}
diff --git a/string/strerror_l.c b/string/strerror_l.c
new file mode 100644
index 0000000000..348a3c50ec
--- /dev/null
+++ b/string/strerror_l.c
@@ -0,0 +1,71 @@
+/* Copyright (C) 2007 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <libintl.h>
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/param.h>
+
+
+static __thread char *last_value;
+
+
+static const char *
+translate (const char *str, locale_t loc)
+{
+ locale_t oldloc = __uselocale (loc);
+ const char *res = _(str);
+ __uselocale (oldloc);
+ return res;
+}
+
+
+/* Return a string describing the errno code in ERRNUM. */
+char *
+strerror_l (int errnum, locale_t loc)
+{
+
+
+ if (__builtin_expect (errnum < 0 || errnum >= _sys_nerr_internal
+ || _sys_errlist_internal[errnum] == NULL, 0))
+ {
+ free (last_value);
+ if (__asprintf (&last_value, "%s%d",
+ translate ("Unknown error ", loc), errnum) == -1)
+ last_value = NULL;
+
+ return last_value;
+ }
+
+ return (char *) translate (_sys_errlist_internal[errnum], loc);
+}
+
+
+#ifdef _LIBC
+# ifdef _LIBC_REENTRANT
+/* This is called when a thread is exiting to free the last_value string. */
+static void __attribute__ ((section ("__libc_thread_freeres_fn")))
+strerror_thread_freeres (void)
+{
+ free (last_value);
+}
+text_set_element (__libc_thread_subfreeres, strerror_thread_freeres);
+text_set_element (__libc_subfreeres, strerror_thread_freeres);
+# endif
+#endif
diff --git a/string/string.h b/string/string.h
index 1adf925bb0..5e1a96fc06 100644
--- a/string/string.h
+++ b/string/string.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1995-2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1995-2004, 2007 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
@@ -283,6 +283,12 @@ extern char *strerror_r (int __errnum, char *__buf, size_t __buflen)
# endif
#endif
+#ifdef __USE_GNU
+/* Translate error number to string according to the locale L. */
+extern char *strerror_l (int __errnum, __locale_t __l) __THROW;
+#endif
+
+
/* We define this function always since `bzero' is sometimes needed when
the namespace rules does not allow this. */
extern void __bzero (void *__s, size_t __n) __THROW __nonnull ((1));