fix formatting, "id -G" was broken

SCCS-vsn: usr.bin/id/id.c 5.4

diff --git a/usr/src/usr.bin/id/id.c b/usr/src/usr.bin/id/id.c
index c9a12b2..2c48ffc 100644 (file)
--- a/usr/src/usr.bin/id/id.c
+++ b/usr/src/usr.bin/id/id.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)id.c       5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)id.c       5.4 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -253,11 +253,17 @@ group(pw, nflag)
                for (lastid = -1; --ngroups >= 0;) {
                        if (lastid == (id = groups[ngroups]))
                                continue;
                for (lastid = -1; --ngroups >= 0;) {
                        if (lastid == (id = groups[ngroups]))
                                continue;

-                       if (nflag && (gr = getgrgid(id))) {
-                               (void)printf(fmt, gr->gr_name);
+                       if (nflag) {
+                               if (gr = getgrgid(id))
+                                       (void)printf(fmt, gr->gr_name);
+                               else
+                                       (void)printf(*fmt == ' ' ? " %u" : "%u",
+                                           id);

                                fmt = " %s";
                                fmt = " %s";

-                       } else
-                               (void)printf(*fmt == ' ' ? " %u" : "%u", id);
+                       } else {
+                               (void)printf(fmt, id);
+                               fmt = " %u";
+                       }

                        lastid = id;
                }
        }
                        lastid = id;
                }
        }