fix for ANSI C

[unix-history] / usr / src / old / groups / groups.c

diff --git a/usr/src/old/groups/groups.c b/usr/src/old/groups/groups.c
index 2a4fec3..04c8c8b 100644 (file)
--- a/usr/src/old/groups/groups.c
+++ b/usr/src/old/groups/groups.c
@@ -1,4 +1,24 @@
-/*     groups.c        4.6     83/06/29        */
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at 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'' without express or implied warranty.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)groups.c   5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * groups
 
 /*
  * groups


@@ -7,6 +27,7 @@
 #include <sys/param.h>
 #include <grp.h>
 #include <pwd.h>
 #include <sys/param.h>
 #include <grp.h>
 #include <pwd.h>

+#include <stdio.h>

 
 int    groups[NGROUPS];
 
 
 int    groups[NGROUPS];
 


@@ -37,16 +58,27 @@ showgroups(user)
        register char *user;
 {
        register struct group *gr;
        register char *user;
 {
        register struct group *gr;

+       register struct passwd *pw;

        register char **cp;
        char *sep = "";
 
        register char **cp;
        char *sep = "";
 

-       while (gr = getgrent())
+       if ((pw = getpwnam(user)) == NULL) {
+               fprintf(stderr, "groups: no such user.\n");
+               exit(1);
+       }
+       while (gr = getgrent()) {
+               if (pw->pw_gid == gr->gr_gid) {
+                       printf("%s%s", sep, gr->gr_name);
+                       sep = " ";
+                       continue;
+               }

                for (cp = gr->gr_mem; cp && *cp; cp++)
                        if (strcmp(*cp, user) == 0) {
                                printf("%s%s", sep, gr->gr_name);
                                sep = " ";
                                break;
                        }
                for (cp = gr->gr_mem; cp && *cp; cp++)
                        if (strcmp(*cp, user) == 0) {
                                printf("%s%s", sep, gr->gr_name);
                                sep = " ";
                                break;
                        }

+       }

        printf("\n");
        exit(0);
 }
        printf("\n");
        exit(0);
 }