summary refs log tree commit diff
path: root/grp/fgetgrent.c
diff options
context:
space:
mode:
Diffstat (limited to 'grp/fgetgrent.c')
-rw-r--r--grp/fgetgrent.c36
1 files changed, 2 insertions, 34 deletions
diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index 38ccd15e6f..95ae2ecd6a 100644
--- a/grp/fgetgrent.c
+++ b/grp/fgetgrent.c
@@ -16,25 +16,8 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <stdio.h>
 #include <grp.h>
-
-/* Define a line parsing function using the common code
-   used in the nss_files module.  */
-
-#define STRUCTURE	group
-#define ENTNAME		grent
-struct grent_data {};
-
-#define TRAILING_LIST_MEMBER		gr_mem
-#define TRAILING_LIST_SEPARATOR_P(c)	((c) == ',')
-#include "../nss/nss_files/files-parse.c"
-LINE_PARSER
-(,
- STRING_FIELD (result->gr_name, ISCOLON, 0);
- STRING_FIELD (result->gr_passwd, ISCOLON, 0);
- INT_FIELD (result->gr_gid, ISCOLON, 0, 10,);
- )
+#include <stdio.h>
 
 
 /* Read one entry from the given stream.  */
@@ -43,21 +26,6 @@ fgetgrent (FILE *stream)
 {
   static char buffer[BUFSIZ];
   static struct group result;
-  char *p;
-
-  do
-    {
-      p = fgets (buffer, sizeof buffer, stream);
-      if (p == NULL)
-	return NULL;
-
-      /* Skip leading blanks.  */
-      while (isspace (*p))
-	++p;
-    } 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, &result, (void *) buffer, sizeof buffer));
 
-  return &result;
+  return __fgetgrent_r (stream, &result, buffer, sizeof buffer);
 }