Sparc string routines from Jakub.

[glibc.git] / pwd / fgetpwent_r.c

diff --git a/pwd/fgetpwent_r.c b/pwd/fgetpwent_r.c
index 9bf33976756033265b5d99127a0b2c786fc4bbce..4986e7452cee70eba1b1c5ea35e7c241fc58a41e 100644 (file)
--- a/pwd/fgetpwent_r.c
+++ b/pwd/fgetpwent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998 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
@@ -17,9 +17,15 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <pwd.h>
 
+#ifdef USE_IN_LIBIO
+# define flockfile(s) _IO_flockfile (s)
+# define funlockfile(s) _IO_funlockfile (s)
+#endif
+
 /* Define a line parsing function using the common code
    used in the nss_files module.  */
 
@@ -27,7 +33,7 @@
 #define ENTNAME                pwent
 struct pwent_data {};
 
-#include "../nss/nss_files/files-parse.c"
+#include <nss/nss_files/files-parse.c>
 LINE_PARSER
 (,
  STRING_FIELD (result->pw_name, ISCOLON, 0);
@@ -71,14 +77,23 @@ __fgetpwent_r (FILE *stream, struct passwd *resbuf, char *buffer,
 {
   char *p;
 
+  flockfile (stream);
   do
     {
-      p = fgets (buffer, buflen, stream);
-      if (p == NULL)
+      buffer[buflen - 1] = '\xff';
+      p = fgets_unlocked (buffer, buflen, stream);
+      if (p == NULL && feof_unlocked (stream))
        {
+         funlockfile (stream);
          *result = NULL;
          return errno;
        }
+      if (p == NULL || buffer[buflen - 1] != '\xff')
+       {
+         funlockfile (stream);
+         *result = NULL;
+         return errno = ERANGE;
+       }
 
       /* Skip leading blanks.  */
       while (isspace (*p))
@@ -86,7 +101,9 @@ __fgetpwent_r (FILE *stream, struct passwd *resbuf, char *buffer,
     } 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_line (p, resbuf, (void *) buffer, buflen, &errno));
+
+  funlockfile (stream);
 
   *result = resbuf;
   return 0;