redo from scratch; clean up semantics, make consistent with getpwent

SCCS-vsn: lib/libc/gen/getgrent.c 5.4

diff --git a/usr/src/lib/libc/gen/getgrent.c b/usr/src/lib/libc/gen/getgrent.c
index 6b9f7a1..d19b4d5 100644 (file)
--- a/usr/src/lib/libc/gen/getgrent.c
+++ b/usr/src/lib/libc/gen/getgrent.c
@@ -1,71 +1,151 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #if defined(LIBC_SCCS) && !defined(lint)
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)getgrent.c 5.3 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)getgrent.c 5.4 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

 
 

+#include <sys/types.h>

 #include <stdio.h>
 #include <grp.h>
 
 #include <stdio.h>
 #include <grp.h>
 

-#define        MAXGRP  200
+static FILE *_gr_fp;
+static struct group _gr_group;
+static int _gr_stayopen;
+static char *_gr_file = _PATH_GROUP;

 
 

-static char *GROUP = "/etc/group";
-static FILE *grf = NULL;
-static char line[BUFSIZ+1];
-static struct group group;
-static char *gr_mem[MAXGRP];
+#define        MAXGRP          200
+static char *members[MAXGRP];
+#define        MAXLINELENGTH   1024
+static char line[MAXLINELENGTH];

 
 

-setgrent()
+struct group *
+getgrent()

 {
 {

-       if( !grf )
-               grf = fopen( GROUP, "r" );
-       else
-               rewind( grf );
+       if (!_gr_fp && !start_gr() || !grscan(0, 0, (char *)NULL))
+               return((struct group *)NULL);
+       return(&_gr_group);

 }
 
 }
 

-endgrent()
+struct group *
+getgrnam(name)
+       char *name;
+{
+       int rval;
+
+       if (!start_gr())
+               return((struct group *)NULL);
+       rval = grscan(1, 0, name);
+       if (!_gr_stayopen)
+               endgrent();
+       return(rval ? &_gr_group : (struct group *)NULL);
+}
+
+struct group *
+getgrgid(gid)
+       int gid;
+{
+       int rval;
+
+       if (!start_gr())
+               return((struct group *)NULL);
+       rval = grscan(1, gid, (char *)NULL);
+       if (!_gr_stayopen)
+               endgrent();
+       return(rval ? &_gr_group : (struct group *)NULL);
+}
+
+static
+start_gr()

 {
 {

-       if( grf ){
-               fclose( grf );
-               grf = NULL;
+       if (_gr_fp) {
+               rewind(_gr_fp);
+               return(1);

        }
        }

+       return((_gr_fp = fopen(_gr_file, "r")) ? 1 : 0);

 }
 
 }
 

-static char *
-grskip(p,c)
-register char *p;
-register c;
+setgrent()

 {
 {

-       while( *p && *p != c ) ++p;
-       if( *p ) *p++ = 0;
-       return( p );
+       return(setgroupent(0));

 }
 
 }
 

-struct group *
-getgrent()
+setgroupent(stayopen)
+       int stayopen;
+{
+       if (!start_gr())
+               return(0);
+       _gr_stayopen = stayopen;
+       return(1);
+}
+
+void
+endgrent()

 {
 {

-       register char *p, **q;
-
-       if( !grf && !(grf = fopen( GROUP, "r" )) )
-               return(NULL);
-       if( !(p = fgets( line, BUFSIZ, grf )) )
-               return(NULL);
-       group.gr_name = p;
-       group.gr_passwd = p = grskip(p,':');
-       group.gr_gid = atoi( p = grskip(p,':') );
-       group.gr_mem = gr_mem;
-       p = grskip(p,':');
-       grskip(p,'\n');
-       q = gr_mem;
-       while( *p ){
-               if (q < &gr_mem[MAXGRP-1])
-                       *q++ = p;
-               p = grskip(p,',');
+       if (_gr_fp) {
+               (void)fclose(_gr_fp);
+               _gr_fp = (FILE *)NULL;

        }
        }

-       *q = NULL;
-       return( &group );

 }
 
 }
 

+void

 setgrfile(file)
        char *file;
 {
 setgrfile(file)
        char *file;
 {

-       GROUP = file;
+       _gr_file = file;
+}
+
+static
+grscan(search, gid, name)
+       register int search, gid;
+       register char *name;
+{
+       register char *cp, **m;
+       char *fgets(), *strsep(), *index();
+
+       for (;;) {
+               if (!fgets(line, sizeof(line), _gr_fp))
+                       return(0);
+               /* skip lines that are too big */
+               if (!index(line, '\n')) {
+                       int ch;
+
+                       while ((ch = getc(_gr_fp)) != '\n' && ch != EOF)
+                               ;
+                       continue;
+               }
+               _gr_group.gr_name = strsep(line, ":\n");
+               if (search && name && strcmp(_gr_group.gr_name, name))
+                       continue;
+               _gr_group.gr_passwd = strsep((char *)NULL, ":\n");
+               if (!(cp = strsep((char *)NULL, ":\n")))
+                       continue;
+               _gr_group.gr_gid = atoi(cp);
+               if (search && gid && _gr_group.gr_gid != gid)
+                       continue;
+               for (m = _gr_group.gr_mem = members;; ++m) {
+                       if (m == &members[MAXGRP - 1]) {
+                               *m = NULL;
+                               break;
+                       }
+                       if ((*m = strsep((char *)NULL, ", \n")) == NULL)
+                               break;
+               }
+               return(1);
+       }
+       /* NOTREACHED */

 }
 }