Update.

1999-06-09  Ulrich Drepper  <drepper@cygnus.com>

	* pwd/fgetpwent_r.c: Set errno in the correct way.
	* shadow/fgetspent_r.c: Likewise.
	* pwd/fgetpwent.c: Handle long lines correctly.  Little
	optimizations.  Free static buffer when debugging memory handling.
	* shadow/fgetspent.c: Likewise.

	* grp/fgetgrent.c: Little optimization in loop.

1999-06-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* grp/tst_fgetgrent.c (write_group): Fix generation of long line
	in a different way.

diff --git a/ChangeLog b/ChangeLog
index 6a66a3f39a18d77c3d01703f48791294bcfff3e3..dc4a51d5e70c86346314c3a8ec1c39ed15ae82e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1999-06-09  Ulrich Drepper  <drepper@cygnus.com>
+
+       * pwd/fgetpwent_r.c: Set errno in the correct way.
+       * shadow/fgetspent_r.c: Likewise.
+       * pwd/fgetpwent.c: Handle long lines correctly.  Little
+       optimizations.  Free static buffer when debugging memory handling.
+       * shadow/fgetspent.c: Likewise.
+
+       * grp/fgetgrent.c: Little optimization in loop.
+
+1999-06-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+       * grp/tst_fgetgrent.c (write_group): Fix generation of long line
+       in a different way.
+
 1999-06-09  Jakub Jelinek   <jj@ultra.linux.cz>
 
        * stdlib/longlong.h: gas changed sethi handling when without

diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index d2e3de69a7111b5bc83c036d92c66a2d54f5f71b..245524f178e33c67adbbb0f773a4576e28b03166 100644 (file)
--- a/grp/fgetgrent.c
+++ b/grp/fgetgrent.c
@@ -52,8 +52,8 @@ fgetgrent (FILE *stream)
     }
 
   while (buffer != NULL
-        && __fgetgrent_r (stream, &resbuf, buffer, buffer_size, &result) != 0
-        && errno == ERANGE)
+        && (__fgetgrent_r (stream, &resbuf, buffer, buffer_size, &result)
+            == ERANGE))
     {
       char *new_buf;
       buffer_size += NSS_BUFLEN_GROUP;
@@ -70,10 +70,7 @@ fgetgrent (FILE *stream)
 
       /* Reset the stream.  */
       if (fsetpos (stream, &pos) != 0)
-       {
-         buffer = NULL;
-         break;
-       }
+       buffer = NULL;
     }
 
   if (buffer == NULL)

diff --git a/grp/tst_fgetgrent.c b/grp/tst_fgetgrent.c
index 2790f2d1d66da98afd6fb9f6b410facf66cf4d6b..79331f72d5d70c5db6063999a0a3ef0c1f2c9d0a 100644 (file)
--- a/grp/tst_fgetgrent.c
+++ b/grp/tst_fgetgrent.c
@@ -32,9 +32,12 @@ write_users (FILE *f, int large_pos, int pos)
 
   if (pos == large_pos)
     {
+      if (large_pos == 3)
+       fprintf (f, ":three");
+
       /* we need more than 2048 bytes for proper testing.  */
       for (i = 0; i < 500; i++)
-       fprintf (f, "%suser%03d", i == 0 ? ":" : ",", i);
+       fprintf (f, ",user%03d", i);
     }
   fprintf (f, "\n");
 

diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c
index 0b5a16941fc0b5315144dbdd0f9e8d4817241e90..09a13c39f91b3c9dd51e2310e8b03d27c5922210 100644 (file)
--- a/pwd/fgetpwent.c
+++ b/pwd/fgetpwent.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,22 +19,28 @@
 #include <errno.h>
 #include <bits/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);
 
+static char *buffer;
+
 /* Read one entry from the given stream.  */
 struct passwd *
 fgetpwent (FILE *stream)
 {
-  static char *buffer;
   static size_t buffer_size;
   static struct passwd resbuf;
+  fpos_t pos;
   struct passwd *result;
   int save;
 
+  if (fgetpos (stream, &pos) != 0)
+    return NULL;
+
   /* Get lock.  */
   __libc_lock_lock (lock);
 
@@ -46,8 +52,8 @@ fgetpwent (FILE *stream)
     }
 
   while (buffer != NULL
-        && __fgetpwent_r (stream, &resbuf, buffer, buffer_size, &result) != 0
-        && errno == ERANGE)
+        && (__fgetpwent_r (stream, &resbuf, buffer, buffer_size, &result)
+            == ERANGE))
     {
       char *new_buf;
       buffer_size += NSS_BUFLEN_PASSWD;
@@ -61,6 +67,10 @@ fgetpwent (FILE *stream)
          __set_errno (save);
        }
       buffer = new_buf;
+
+      /* Reset the stream.  */
+      if (fsetpos (stream, &pos) != 0)
+       buffer = NULL;
     }
 
   if (buffer == NULL)
@@ -73,3 +83,14 @@ fgetpwent (FILE *stream)
 
   return result;
 }
+
+
+/* Free all resources if necessary.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  if (buffer != NULL)
+    free (buffer);
+}
+
+text_set_element (__libc_subfreeres, free_mem);

diff --git a/pwd/fgetpwent_r.c b/pwd/fgetpwent_r.c
index 4986e7452cee70eba1b1c5ea35e7c241fc58a41e..c2a746d9023fd0af17044d5fb09029f715422ac0 100644 (file)
--- a/pwd/fgetpwent_r.c
+++ b/pwd/fgetpwent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 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
@@ -92,7 +92,8 @@ __fgetpwent_r (FILE *stream, struct passwd *resbuf, char *buffer,
        {
          funlockfile (stream);
          *result = NULL;
-         return errno = ERANGE;
+         __set_errno (ERANGE);
+         return errno;
        }
 
       /* Skip leading blanks.  */

diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c
index 902c95eb045366a724a84bb165a0e4151049360f..66a5452678d2fbc4f1509fc3bb56e6a0e51a30b2 100644 (file)
--- a/shadow/fgetspent.c
+++ b/shadow/fgetspent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 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 <bits/libc-lock.h>
 #include <shadow.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 
@@ -28,16 +29,21 @@
 /* We need to protect the dynamic buffer handling.  */
 __libc_lock_define_initialized (static, lock);
 
+static char *buffer;
+
 /* Read one shadow entry from the given stream.  */
 struct spwd *
 fgetspent (FILE *stream)
 {
-  static char *buffer;
   static size_t buffer_size;
   static struct spwd resbuf;
+  fpos_t pos;
   struct spwd *result;
   int save;
 
+  if (fgetpos (stream, &pos) != 0)
+    return NULL;
+
   /* Get lock.  */
   __libc_lock_lock (lock);
 
@@ -49,8 +55,8 @@ fgetspent (FILE *stream)
     }
 
   while (buffer != NULL
-        && __fgetspent_r (stream, &resbuf, buffer, buffer_size, &result) != 0
-        && errno == ERANGE)
+        && (__fgetspent_r (stream, &resbuf, buffer, buffer_size, &result)
+            == ERANGE))
     {
       char *new_buf;
       buffer_size += BUFLEN_SPWD;
@@ -64,6 +70,10 @@ fgetspent (FILE *stream)
          __set_errno (save);
        }
       buffer = new_buf;
+
+      /* Reset the stream.  */
+      if (fsetpos (stream, &pos) != 0)
+       buffer = NULL;
     }
 
   if (buffer == NULL)
@@ -76,3 +86,14 @@ fgetspent (FILE *stream)
 
   return result;
 }
+
+
+/* Free all resources if necessary.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  if (buffer != NULL)
+    free (buffer);
+}
+
+text_set_element (__libc_subfreeres, free_mem);

diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c
index 50d1fd9972b037043ab7cd6936d6093417be953a..a61483c95a69379dd9af0bc815cce6268e889cf2 100644 (file)
--- a/shadow/fgetspent_r.c
+++ b/shadow/fgetspent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 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
@@ -59,7 +59,8 @@ __fgetspent_r (FILE *stream, struct spwd *resbuf, char *buffer, size_t buflen,
        {
          funlockfile (stream);
          *result = NULL;
-         return errno = ERANGE;
+         __set_errno (ERANGE);
+         return errno;
        }
 
       /* Skip leading blanks.  */