diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/strerror.c | 14 | ||||
| -rw-r--r-- | string/strerror_r.c | 30 | ||||
| -rw-r--r-- | string/string.h | 9 |
3 files changed, 44 insertions, 9 deletions
diff --git a/string/strerror.c b/string/strerror.c index 67759703c4..62a08a016f 100644 --- a/string/strerror.c +++ b/string/strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1994, 1995 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 @@ -13,21 +13,21 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <stdio.h> #include <string.h> -extern char *_strerror_internal __P ((int, char buf[1024])); +extern char *_strerror_internal __P ((int, char *, size_t)); /* Return a string descibing the errno code in ERRNUM. The storage is good only until the next call to strerror. Writing to the storage causes undefined behavior. */ char * -DEFUN(strerror, (errnum), int errnum) +strerror (errnum) + int errnum; { static char buf[1024]; - return _strerror_internal (errnum, buf); + return _strerror_internal (errnum, buf, sizeof buf); } diff --git a/string/strerror_r.c b/string/strerror_r.c new file mode 100644 index 0000000000..3b45996204 --- /dev/null +++ b/string/strerror_r.c @@ -0,0 +1,30 @@ +/* Copyright (C) 1991, 1993, 1994, 1995 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <stdio.h> +#include <string.h> + +extern char *_strerror_internal __P ((int, char *, size_t)); + +/* Return a string descibing the errno code in ERRNUM. At most BUFLEN + characters of the result will be placed in STRERRBUF. */ +char * +strerror_r (int errnum, char *buf, size_t buflen) +{ + return _strerror_internal (errnum, buf, buflen); +} diff --git a/string/string.h b/string/string.h index 905d727f18..564adcce2a 100644 --- a/string/string.h +++ b/string/string.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1995 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 @@ -120,8 +120,13 @@ extern __ptr_t memmem __P ((__const __ptr_t __haystack, size_t __haystacklen, /* Return the length of S. */ extern size_t strlen __P ((__const char *__s)); -/* Return a string describing the meaning of the errno code in ERRNUM. */ +/* Return a string describing the meaning of the `errno' code in ERRNUM. */ extern char *strerror __P ((int __errnum)); +#ifdef __USE_REENTRANT +/* Reentrant version of `strerror'. If a temporary buffer is required, at + most BUFLEN bytes of BUF will be used. */ +extern char *strerror_r __P ((int __errnum, char *__buf, int __buflen)); +#endif #ifdef __USE_BSD /* Find the first occurrence of C in S (same as strchr). */ |