From db873f322bdefd03e68e7196277aee44fc021791 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 7 Jun 1999 20:17:36 +0000 Subject: Update. 1999-06-07 Ulrich Drepper * grp/fgetgrent.c (fgetgrent): Remember position of stream before reading and reset in case the buffer was too small. * grp/fgetgrent_r.c (__fgetgrent_r): Set errno to ENOENT in case of EOF. --- grp/fgetgrent.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'grp/fgetgrent.c') diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c index 24fdcd86d9..ac8d093f05 100644 --- a/grp/fgetgrent.c +++ b/grp/fgetgrent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1999 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 @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -32,9 +33,13 @@ fgetgrent (FILE *stream) static char *buffer; static size_t buffer_size; static struct group resbuf; + fpos_t pos; struct group *result; int save; + if (fgetpos (stream, &pos) != 0) + return NULL; + /* Get lock. */ __libc_lock_lock (lock); @@ -61,6 +66,13 @@ fgetgrent (FILE *stream) __set_errno (save); } buffer = new_buf; + + /* Reset the stream. */ + if (fsetpos (stream, &pos) != 0) + { + buffer = NULL; + break; + } } if (buffer == NULL) -- cgit v1.2.3