BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / gen / getgrent.c

diff --git a/usr/src/lib/libc/gen/getgrent.c b/usr/src/lib/libc/gen/getgrent.c
index 200f05c..60593c2 100644 (file)
--- a/usr/src/lib/libc/gen/getgrent.c
+++ b/usr/src/lib/libc/gen/getgrent.c
@@ -2,33 +2,48 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * 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: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

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

-static char sccsid[] = "@(#)getgrent.c 5.7 (Berkeley) 6/24/90";
+static char sccsid[] = "@(#)getgrent.c 5.9 (Berkeley) 4/1/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <stdio.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <grp.h>
 
 static FILE *_gr_fp;
 static struct group _gr_group;
 static int _gr_stayopen;
 #include <grp.h>
 
 static FILE *_gr_fp;
 static struct group _gr_group;
 static int _gr_stayopen;

-static char *_gr_file = _PATH_GROUP;
+static int grscan(), start_gr();

 
 #define        MAXGRP          200
 static char *members[MAXGRP];
 
 #define        MAXGRP          200
 static char *members[MAXGRP];


@@ -38,37 +53,41 @@ static char line[MAXLINELENGTH];
 struct group *
 getgrent()
 {
 struct group *
 getgrent()
 {

-       if (!_gr_fp && !start_gr() || !grscan(0, 0, (char *)NULL))
-               return((struct group *)NULL);
+       if (!_gr_fp && !start_gr() || !grscan(0, 0, NULL))
+               return(NULL);

        return(&_gr_group);
 }
 
 struct group *
 getgrnam(name)
        return(&_gr_group);
 }
 
 struct group *
 getgrnam(name)

-       char *name;
+       const char *name;

 {
        int rval;
 
        if (!start_gr())
 {
        int rval;
 
        if (!start_gr())

-               return((struct group *)NULL);
+               return(NULL);

        rval = grscan(1, 0, name);
        if (!_gr_stayopen)
                endgrent();
        rval = grscan(1, 0, name);
        if (!_gr_stayopen)
                endgrent();

-       return(rval ? &_gr_group : (struct group *)NULL);
+       return(rval ? &_gr_group : NULL);

 }
 
 struct group *
 }
 
 struct group *

+#ifdef __STDC__
+getgrgid(gid_t gid)
+#else

 getgrgid(gid)
 getgrgid(gid)

-       int gid;
+       gid_t gid;
+#endif

 {
        int rval;
 
        if (!start_gr())
 {
        int rval;
 
        if (!start_gr())

-               return((struct group *)NULL);
-       rval = grscan(1, gid, (char *)NULL);
+               return(NULL);
+       rval = grscan(1, gid, NULL);

        if (!_gr_stayopen)
                endgrent();
        if (!_gr_stayopen)
                endgrent();

-       return(rval ? &_gr_group : (struct group *)NULL);
+       return(rval ? &_gr_group : NULL);

 }
 
 static
 }
 
 static


@@ -78,14 +97,16 @@ start_gr()
                rewind(_gr_fp);
                return(1);
        }
                rewind(_gr_fp);
                return(1);
        }

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

 }
 
 }
 

+int

 setgrent()
 {
        return(setgroupent(0));
 }
 
 setgrent()
 {
        return(setgroupent(0));
 }
 

+int

 setgroupent(stayopen)
        int stayopen;
 {
 setgroupent(stayopen)
        int stayopen;
 {


@@ -100,17 +121,10 @@ endgrent()
 {
        if (_gr_fp) {
                (void)fclose(_gr_fp);
 {
        if (_gr_fp) {
                (void)fclose(_gr_fp);

-               _gr_fp = (FILE *)NULL;
+               _gr_fp = NULL;

        }
 }
 
        }
 }
 

-void
-setgrfile(file)
-       char *file;
-{
-       _gr_file = file;
-}
-

 static
 grscan(search, gid, name)
        register int search, gid;
 static
 grscan(search, gid, name)
        register int search, gid;