diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/strerror_r.c | 31 | ||||
| -rw-r--r-- | string/strfry.c | 45 | ||||
| -rw-r--r-- | string/string.h | 1 |
3 files changed, 43 insertions, 34 deletions
diff --git a/string/strerror_r.c b/string/strerror_r.c index 3b45996204..e03e50c635 100644 --- a/string/strerror_r.c +++ b/string/strerror_r.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1993, 1994, 1995, 1996 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 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. + 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. */ + 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> @@ -24,7 +24,8 @@ 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) +__strerror_r (int errnum, char *buf, size_t buflen) { return _strerror_internal (errnum, buf, buflen); } +weak_alias (__strerror_r, strerror_r) diff --git a/string/strfry.c b/string/strfry.c index c885f66c68..98aa71aa3f 100644 --- a/string/strfry.c +++ b/string/strfry.c @@ -1,43 +1,50 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1992, 1996 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 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. + 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., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + 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 <ansidecl.h> #include <string.h> #include <stdlib.h> #include <time.h> char * -DEFUN(strfry, (string), char *string) +strfry (char *string) { static int init = 0; + static struct random_data rdata; size_t len, i; if (!init) { - srand (time ((time_t *) NULL)); + static int state[8] = { 1, 2, 3, 4, 5, 6, 7, 8 }; + rdata.state = NULL; + __initstate_r (time ((time_t *) NULL), state, 8, &rdata); init = 1; } len = strlen (string); for (i = 0; i < len; ++i) { - size_t j = rand () % len; - char c = string[i]; + int32_t j; + char c; + + __random_r (&rdata, &j); + j %= len; + + c = string[i]; string[i] = string[j]; string[j] = c; } diff --git a/string/string.h b/string/string.h index ff6d3df21e..79a7aaa58d 100644 --- a/string/string.h +++ b/string/string.h @@ -174,6 +174,7 @@ 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, size_t __buflen)); extern char *strerror_r __P ((int __errnum, char *__buf, size_t __buflen)); #endif |