diff options
| -rw-r--r-- | grp/fgetgrent.c | 76 | ||||
| -rw-r--r-- | pwd/fgetpwent.c | 76 | ||||
| -rw-r--r-- | shadow/fgetspent.c | 53 | ||||
| -rw-r--r-- | shadow/sgetspent.c | 58 |
4 files changed, 209 insertions, 54 deletions
diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c index 66dd305b0b..0b461ad5fe 100644 --- a/grp/fgetgrent.c +++ b/grp/fgetgrent.c @@ -1,35 +1,75 @@ -/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1996, 1997 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 <errno.h> #include <grp.h> -#include <stdio.h> +#include <libc-lock.h> +#include <stdlib.h> +/* We need to protect the dynamic buffer handling. */ +__libc_lock_define_initialized (static, lock); + /* Read one entry from the given stream. */ struct group * fgetgrent (FILE *stream) { - static char buffer[BUFSIZ]; + static char *buffer; + static size_t buffer_size; static struct group resbuf; struct group *result; + int save; + + /* Get lock. */ + __libc_lock_lock (lock); + + /* Allocate buffer if not yet available. */ + if (buffer == NULL) + { + buffer_size = NSS_BUFLEN_GROUP; + buffer = malloc (buffer_size); + } + + while (buffer != NULL + && __fgetgrent_r (stream, &resbuf, buffer, buffer_size, &result) != 0 + && errno == ERANGE) + { + char *new_buf; + buffer_size += NSS_BUFLEN_GROUP; + new_buf = realloc (buffer, buffer_size); + if (new_buf == NULL) + { + /* We are out of memory. Free the current buffer so that the + process gets a chance for a normal termination. */ + save = errno; + free (buffer); + __set_errno (save); + } + buffer = new_buf; + } + + if (buffer == NULL) + result = NULL; - if (__fgetgrent_r (stream, &resbuf, buffer, sizeof buffer, &result) != 0) - return NULL; + /* Release lock. Preserve error value. */ + save = errno; + __libc_lock_unlock (lock); + __set_errno (save); return result; } diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c index 0bcc25ca6a..63f62fcf6d 100644 --- a/pwd/fgetpwent.c +++ b/pwd/fgetpwent.c @@ -1,35 +1,75 @@ -/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1996, 1997 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 <errno.h> +#include <libc-lock.h> #include <pwd.h> -#include <stdio.h> +#include <stdlib.h> +/* We need to protect the dynamic buffer handling. */ +__libc_lock_define_initialized (static, lock); + /* Read one entry from the given stream. */ struct passwd * fgetpwent (FILE *stream) { - static char buffer[BUFSIZ]; + static char *buffer; + static size_t buffer_size; static struct passwd resbuf; struct passwd *result; + int save; + + /* Get lock. */ + __libc_lock_lock (lock); + + /* Allocate buffer if not yet available. */ + if (buffer == NULL) + { + buffer_size = NSS_BUFLEN_PASSWD; + buffer = malloc (buffer_size); + } + + while (buffer != NULL + && __fgetpwent_r (stream, &resbuf, buffer, buffer_size, &result) != 0 + && errno == ERANGE) + { + char *new_buf; + buffer_size += NSS_BUFLEN_PASSWD; + new_buf = realloc (buffer, buffer_size); + if (new_buf == NULL) + { + /* We are out of memory. Free the current buffer so that the + process gets a chance for a normal termination. */ + save = errno; + free (buffer); + __set_errno (save); + } + buffer = new_buf; + } + + if (buffer == NULL) + result = NULL; - if (__fgetpwent_r (stream, &resbuf, buffer, sizeof buffer, &result) != 0) - return NULL; + /* Release lock. Preserve error value. */ + save = errno; + __libc_lock_unlock (lock); + __set_errno (save); return result; } diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c index 6fe813b520..bd54c7e595 100644 --- a/shadow/fgetspent.c +++ b/shadow/fgetspent.c @@ -16,18 +16,63 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> +#include <libc-lock.h> #include <shadow.h> -#include <stdio.h> +#include <stdlib.h> +/* A reasonable size for a buffer to start with. */ +#define BUFLEN_SPWD 1024 + +/* We need to protect the dynamic buffer handling. */ +__libc_lock_define_initialized (static, lock); + /* Read one shadow entry from the given stream. */ struct spwd * fgetspent (FILE *stream) { - static char buffer[BUFSIZ]; + static char *buffer; + static size_t buffer_size; static struct spwd resbuf; struct spwd *result; + int save; + + /* Get lock. */ + __libc_lock_lock (lock); + + /* Allocate buffer if not yet available. */ + if (buffer == NULL) + { + buffer_size = BUFLEN_SPWD; + buffer = malloc (buffer_size); + } + + while (buffer != NULL + && __fgetspent_r (stream, &resbuf, buffer, buffer_size, &result) != 0 + && errno == ERANGE) + { + char *new_buf; + buffer_size += BUFLEN_SPWD; + new_buf = realloc (buffer, buffer_size); + if (new_buf == NULL) + { + /* We are out of memory. Free the current buffer so that the + process gets a chance for a normal termination. */ + save = errno; + free (buffer); + __set_errno (save); + } + buffer = new_buf; + } + + if (buffer == NULL) + result = NULL; + + /* Release lock. Preserve error value. */ + save = errno; + __libc_lock_unlock (lock); + __set_errno (save); - return __fgetspent_r (stream, &resbuf, buffer, sizeof buffer, &result) - ? NULL : result; + return result; } diff --git a/shadow/sgetspent.c b/shadow/sgetspent.c index 05d997c1bf..ecfe01ed1d 100644 --- a/shadow/sgetspent.c +++ b/shadow/sgetspent.c @@ -16,33 +16,63 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> +#include <libc-lock.h> #include <shadow.h> -#include <stdio.h> #include <stdlib.h> -#include <string.h> -#define MAX(a, b) ((a) > (b) ? (a) : (b)) +/* A reasonable size for a buffer to start with. */ +#define BUFLEN_SPWD 1024 + +/* We need to protect the dynamic buffer handling. */ +__libc_lock_define_initialized (static, lock); /* Read one shadow entry from the given stream. */ struct spwd * sgetspent (const char *string) { + static char *buffer; + static size_t buffer_size; static struct spwd resbuf; - static int max_size = 0; - static char *buffer = NULL; struct spwd *result; - int len; + int save; + + /* Get lock. */ + __libc_lock_lock (lock); - len = strlen (string) + 1; - if (len > max_size) + /* Allocate buffer if not yet available. */ + if (buffer == NULL) { - max_size = MAX (128, len + 32); - buffer = realloc (buffer, max_size); - if (buffer == NULL) - return NULL; + buffer_size = BUFLEN_SPWD; + buffer = malloc (buffer_size); } - return __sgetspent_r (string, &resbuf, buffer, max_size, &result) - ? NULL : result; + while (buffer != NULL + && __sgetspent_r (string, &resbuf, buffer, buffer_size, &result) != 0 + && errno == ERANGE) + { + char *new_buf; + buffer_size += BUFLEN_SPWD; + new_buf = realloc (buffer, buffer_size); + if (new_buf == NULL) + { + /* We are out of memory. Free the current buffer so that the + process gets a chance for a normal termination. */ + save = errno; + free (buffer); + __set_errno (save); + } + buffer = new_buf; + } + + if (buffer == NULL) + result = NULL; + + /* Release lock. Preserve error value. */ + save = errno; + __libc_lock_unlock (lock); + __set_errno (save); + + return result; } |