lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

Update.

Browse Source 
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.
This commit is contained in:
Ulrich Drepper
2004-03-22 19:54:06 +00:00
parent 9708780004
commit 61645263d4
9 changed files with 199 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
string/Makefile
View File

@@ -39,7 +39,8 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \
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.

4
string/Versions
View File

@@ -73,4 +73,8 @@ libc {
# m*
memrchr;
}
GLIBC_2.3.4 {
# x*
__xpg_strerror_r;
}
}

25
string/string.h
View File

@@ -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