From 61645263d4b3c72c9a33659a0fcabe1dd2814a98 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 22 Mar 2004 19:54:06 +0000 Subject: Update. 2004-03-22 Jakub Jelinek * 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. --- sysdeps/generic/xpg-strerror.c | 57 +++++++++++++++ sysdeps/mach/xpg-strerror.c | 83 ++++++++++++++++++++++ .../unix/sysv/linux/sparc/sparc32/getpagesize.c | 10 ++- 3 files changed, 147 insertions(+), 3 deletions(-) create mode 100644 sysdeps/generic/xpg-strerror.c create mode 100644 sysdeps/mach/xpg-strerror.c (limited to 'sysdeps') diff --git a/sysdeps/generic/xpg-strerror.c b/sysdeps/generic/xpg-strerror.c new file mode 100644 index 0000000000..5cb56cdfb8 --- /dev/null +++ b/sysdeps/generic/xpg-strerror.c @@ -0,0 +1,57 @@ +/* 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 +#include +#include +#include +#include +#include + +/* It is critical here that we always use the `dcgettext' function for + the message translation. Since only defines the macro + `dgettext' to use `dcgettext' for optimizing programs this is not + always guaranteed. */ +#ifndef dgettext +# include /* 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; +} diff --git a/sysdeps/mach/xpg-strerror.c b/sysdeps/mach/xpg-strerror.c new file mode 100644 index 0000000000..8d0b31e600 --- /dev/null +++ b/sysdeps/mach/xpg-strerror.c @@ -0,0 +1,83 @@ +/* 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 +#include +#include +#include +#include +#include +#include +#include + +/* It is critical here that we always use the `dcgettext' function for + the message translation. Since only defines the macro + `dgettext' to use `dcgettext' for optimizing programs this is not + always guaranteed. */ +#ifndef dgettext +# include /* 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; +} diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c index 00bbdc744f..4760daff24 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c @@ -31,12 +31,16 @@ 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) -- cgit 1.4.1