From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 7 Jun 1999 20:18:31 +0000 (+0000)
Subject: (fgetgrent): Remember position of stream before
X-Git-Tag: cvs/glibc_2-1-2~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a817a69320326e6ba3a7ff944546e7ce0418f9c;p=thirdparty%2Fglibc.git

(fgetgrent): Remember position of stream before
reading and reset in case the buffer was too small.
---

diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index 24fdcd86d91..ac8d093f05a 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 <errno.h>
 #include <grp.h>
 #include <bits/libc-lock.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 
@@ -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)