+2004-03-22 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c
+ (__getpagesize): Avoid warning about writing into read-only memory.
+
+ * string/Makefile (routines): Add xpg-strerror.
+ * string/string.h (strerror_r): If __USE_XOPEN2K but not __USE_GNU,
+ redirect strerror_r to __xpg_strerror_r.
+ * string/Versions (libc): Add __xpg_strerror_r@@GLIBC_2.3.4.
+ * sysdeps/generic/xpg-strerror.c: New file.
+ * sysdeps/mach/xpg-strerror.c: New file.
+
2004-03-22 Joseph S. Myers <jsm@polyomino.org.uk>
* sunrpc/rpc/xdr.h (IXDR_GET_LONG, IXDR_PUT_LONG): Do not use
+2004-03-22 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/pthread_getaffinity.c
+ (__pthread_getaffinity_new): Use INT_MAX instead of UINT_MAX.
+ * pthread_getattr_np.c (pthread_getattr_np): Double size every cycle.
+ If realloc fails, break out of the loop.
+
2004-03-20 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/pthread_setaffinity.c
if (ret == 0)
{
- size_t size = 32;
+ size_t size = 16;
cpu_set_t *cpuset = NULL;
do
{
+ size <<= 1;
+
void *newp = realloc (cpuset, size);
if (newp == NULL)
{
- free (cpuset);
ret = ENOMEM;
+ break;
}
cpuset = (cpu_set_t *) newp;
delete extract insert stringify \
addsep replace) \
envz basename \
- strcoll_l strxfrm_l string-inlines memrchr
+ strcoll_l strxfrm_l string-inlines memrchr \
+ xpg-strerror
# Gcc internally generates calls to unbounded memcpy and memset
# for -fbounded-pointer compiles. Glibc uses memchr for explicit checks.
# m*
memrchr;
}
+ GLIBC_2.3.4 {
+ # x*
+ __xpg_strerror_r;
+ }
}
extern char *strerror (int __errnum) __THROW;
__END_NAMESPACE_STD
#if defined __USE_XOPEN2K || defined __USE_MISC
-/* Reentrant version of `strerror'. If a temporary buffer is required, at
- most BUFLEN bytes of BUF will be used. */
+/* Reentrant version of `strerror'.
+ There are 2 flavors of `strerror_r', GNU which returns the string
+ and may or may not use the supplied temporary buffer and POSIX one
+ which fills the string into the buffer.
+ To use the POSIX version, -D_XOPEN_SOURCE=600 or -D_POSIX_C_SOURCE=200112L
+ without -D_GNU_SOURCE is needed, otherwise the GNU version is
+ preferred. */
+# if defined __USE_XOPEN2K && !defined __USE_GNU
+/* Fill BUF with a string describing the meaning of the `errno' code in
+ ERRNUM. */
+# ifdef __REDIRECT
+extern int __REDIRECT (strerror_r,
+ (int __errnum, char *__buf, size_t __buflen),
+ __xpg_strerror_r) __THROW;
+# else
+extern int __xpg_strerror_r (int __errnum, char *__buf, size_t __buflen)
+ __THROW;
+# define strerror_r __xpg_strerror_r
+# endif
+# else
+/* If a temporary buffer is required, at most BUFLEN bytes of BUF will be
+ used. */
extern char *strerror_r (int __errnum, char *__buf, size_t __buflen) __THROW;
+# endif
#endif
/* We define this function always since `bzero' is sometimes needed when
--- /dev/null
+/* Copyright (C) 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004
+ 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 <errno.h>
+#include <libintl.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/param.h>
+#include <stdio-common/_itoa.h>
+
+/* It is critical here that we always use the `dcgettext' function for
+ the message translation. Since <libintl.h> only defines the macro
+ `dgettext' to use `dcgettext' for optimizing programs this is not
+ always guaranteed. */
+#ifndef dgettext
+# include <locale.h> /* We need LC_MESSAGES. */
+# define dgettext(domainname, msgid) dcgettext (domainname, msgid, LC_MESSAGES)
+#endif
+
+/* Fill buf with a string describing the errno code in ERRNUM. */
+int
+__xpg_strerror_r (int errnum, char *buf, size_t buflen)
+{
+ if (errnum < 0 || errnum >= _sys_nerr_internal
+ || _sys_errlist_internal[errnum] == NULL)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+ const char *estr = (const char *) _(_sys_errlist_internal[errnum]);
+ size_t estrlen = strlen (estr) + 1;
+
+ if (buflen < estrlen)
+ {
+ __set_errno (ERANGE);
+ return -1;
+ }
+
+ memcpy (buf, estr, estrlen);
+ return 0;
+}
--- /dev/null
+/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004
+ 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 <errno.h>
+#include <libintl.h>
+#include <stdio.h>
+#include <string.h>
+#include <mach/error.h>
+#include <errorlib.h>
+#include <sys/param.h>
+#include <stdio-common/_itoa.h>
+
+/* It is critical here that we always use the `dcgettext' function for
+ the message translation. Since <libintl.h> only defines the macro
+ `dgettext' to use `dcgettext' for optimizing programs this is not
+ always guaranteed. */
+#ifndef dgettext
+# include <locale.h> /* We need LC_MESSAGES. */
+# define dgettext(domainname, msgid) dcgettext (domainname, msgid, LC_MESSAGES)
+#endif
+
+/* Fill buf with a string describing the errno code in ERRNUM. */
+int
+__xpg_strerror_r (int errnum, char *buf, size_t buflen)
+{
+ int system;
+ int sub;
+ int code;
+ const struct error_system *es;
+ extern void __mach_error_map_compat (int *);
+ const char *estr;
+
+ __mach_error_map_compat (&errnum);
+
+ system = err_get_system (errnum);
+ sub = err_get_sub (errnum);
+ code = err_get_code (errnum);
+
+ if (system > err_max_system || ! __mach_error_systems[system].bad_sub)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ es = &__mach_error_systems[system];
+
+ if (sub >= es->max_sub)
+ estr = (const char *) es->bad_sub;
+ else if (code >= es->subsystem[sub].max_code)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+ else
+ estr = (const char *) _(es->subsystem[sub].codes[code]);
+
+ size_t estrlen = strlen (estr) + 1;
+
+ if (buflen < estrlen)
+ {
+ __set_errno (ERANGE);
+ return -1;
+ }
+
+ memcpy (buf, estr, estrlen);
+ return 0;
+}
int
__getpagesize ()
{
- if (GLRO(dl_pagesize) == 0)
+ int ret = GLRO(dl_pagesize);
+ if (ret == 0)
{
INTERNAL_SYSCALL_DECL (err);
- GLRO(dl_pagesize) = INTERNAL_SYSCALL (getpagesize, err, 0);
+ ret = INTERNAL_SYSCALL (getpagesize, err, 0);
+#ifndef SHARED
+ GLRO(dl_pagesize) = ret;
+#endif
}
- return GLRO(dl_pagesize);
+ return ret;
}
libc_hidden_def (__getpagesize)
weak_alias (__getpagesize, getpagesize)
projects / external / glibc.git / commitdiff