summaryrefslogtreecommitdiff
path: root/grp
diff options
context:
space:
mode:
Diffstat (limited to 'grp')
-rw-r--r--grp/fgetgrent.c48
-rw-r--r--grp/fgetgrent_r.c15
2 files changed, 56 insertions, 7 deletions
diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index 9873ba1b61..0b461ad5fe 100644
--- a/grp/fgetgrent.c
+++ b/grp/fgetgrent.c
@@ -16,20 +16,60 @@
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/grp/fgetgrent_r.c b/grp/fgetgrent_r.c
index dd74cfcd70..44298c5ba6 100644
--- a/grp/fgetgrent_r.c
+++ b/grp/fgetgrent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+/* 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
@@ -56,6 +56,7 @@ __fgetgrent_r (FILE *stream, struct group *resbuf, char *buffer, size_t buflen,
struct group **result)
{
char *p;
+ int parse_result;
do
{
@@ -69,10 +70,18 @@ __fgetgrent_r (FILE *stream, struct group *resbuf, char *buffer, size_t buflen,
/* Skip leading blanks. */
while (isspace (*p))
++p;
- } while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
+ } while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
/* Parse the line. If it is invalid, loop to
get the next line of the file to parse. */
- ! parse_line (p, resbuf, (void *) buffer, buflen));
+ || ! (parse_result = parse_line (p, resbuf,
+ (void *) buffer, buflen)));
+
+ if (parse_result == -1)
+ {
+ /* The parser ran out of space. */
+ *result = NULL;
+ return errno;
+ }
*result = resbuf;
return 0;