From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13849 invoked by alias); 22 Mar 2004 18:11:03 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 13833 invoked from network); 22 Mar 2004 18:11:02 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26) by sources.redhat.com with SMTP; 22 Mar 2004 18:11:02 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i2MG1MHS031064; Mon, 22 Mar 2004 17:01:22 +0100 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i2MG1LDe031062; Mon, 22 Mar 2004 17:01:21 +0100 Date: Tue, 23 Mar 2004 18:40:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] XPG6 conforming strerror_r Message-ID: <20040322160121.GC15946@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2004-03/txt/msg00118.txt.bz2 Hi! Unfortunately, XPG6 strerror_r is different from GNU strerror_r. This adds XPG6 strerror_r as __xpg_strerror_r and makes string.h redirect strerror_r to that function if -D_XOPEN_SOURCE=600 or -D_POSIX_C_SOURCE=200112L (but not for -D_GNU_SOURCE). 2004-03-22 Jakub Jelinek * 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. --- libc/sysdeps/generic/xpg-strerror.c.jj 2004-03-22 13:52:07.340664615 +0100 +++ libc/sysdeps/generic/xpg-strerror.c 2004-03-22 18:46:30.643294291 +0100 @@ -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; +} --- libc/sysdeps/mach/xpg-strerror.c.jj 2004-03-22 14:01:58.766858254 +0100 +++ libc/sysdeps/mach/xpg-strerror.c 2004-03-22 18:46:47.116329227 +0100 @@ -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; +} --- libc/string/Versions.jj 2001-10-07 22:13:21.000000000 +0200 +++ libc/string/Versions 2004-03-22 18:47:25.454428652 +0100 @@ -73,4 +73,8 @@ libc { # m* memrchr; } + GLIBC_2.3.4 { + # x* + __xpg_strerror_r; + } } --- libc/string/string.h.jj 2003-07-15 17:04:38.000000000 +0200 +++ libc/string/string.h 2004-03-22 18:47:13.388600399 +0100 @@ -243,9 +243,30 @@ __BEGIN_NAMESPACE_STD 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 --- libc/string/Makefile.jj 2003-09-14 20:13:42.000000000 +0200 +++ libc/string/Makefile 2004-03-22 18:35:06.919510383 +0100 @@ -39,7 +39,8 @@ routines := strcat strchr strcmp strcoll 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. Jakub