Clean up, reindent, add a special case for NIS / LDAP line

MFC after:	1 week

1 files changed, 127 insertions, 129 deletions

diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c
index c9515b5..d7c1506 100644
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@@ -40,154 +40,152 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <sysexits.h>
 
-static char empty[] = { 0 };
-
 static void __dead2
 usage(void)
 {
-    fprintf(stderr, "usage: chkgrp [groupfile]\n");
-    exit(EX_USAGE);
+
+	fprintf(stderr, "usage: chkgrp [-q] [groupfile]\n");
+	exit(EX_USAGE);
 }
 
 int
 main(int argc, char *argv[])
 {
-    unsigned int i;
-    size_t len;
-    int quiet;
-    int ch;
-    int n = 0, k, e = 0;
-    char *line, *f[4], *p;
-    const char *cp, *gfn;
-    FILE *gf;
-
-    quiet = 0;
-    while ((ch = getopt(argc, argv, "q")) != -1) {
-	    switch (ch) {
+	FILE *gf;
+	unsigned long gid;
+	unsigned int i;
+	size_t len;
+	int opt, quiet;
+	int n = 0, k, e = 0;
+	const char *cp, *f[4], *gfn, *p;
+	char *line;
+
+	quiet = 0;
+	while ((opt = getopt(argc, argv, "q")) != -1) {
+		switch (opt) {
 		case 'q':
 			quiet = 1;
 			break;
-		case '?':
 		default:
 			usage();
-	    }
-    }
-
-    if (optind == argc)
-	    gfn = "/etc/group";
-    else if (optind == argc - 1)
-	    gfn = argv[optind];
-    else
-	    usage();
-
-    /* open group file */
-    if ((gf = fopen(gfn, "r")) == NULL)
-	err(EX_NOINPUT, "%s", gfn);
-
-    /* check line by line */
-    while (++n) {
-	if ((line = fgetln(gf, &len)) == NULL)
-	    break;
-	if (len > 0 && line[len - 1] != '\n') {
-	    warnx("%s: line %d: no newline character", gfn, n);
-	    e = 1;
-	}
-	while (len && isspace(line[len-1]))
-	    len--;
-
-	/* ignore blank lines and comments */
-	for (p = line; p < (line + len); p++)
-	    if (!isspace(*p)) break;
-	if (!len || (*p == '#')) {
-#if 0
-	    /* entry is correct, so print it */
-	    printf("%*.*s\n", len, len, line);
-#endif
-	    continue;
-	}
-	
-	/*
-	 * A correct group entry has four colon-separated fields, the third
-	 * of which must be entirely numeric and the fourth of which may
-	 * be empty.
-	 */
-	for (i = k = 0; k < 4; k++) {
-	    for (f[k] = line+i; (i < len) && (line[i] != ':'); i++)
-		/* nothing */ ;
-	    if ((k < 3) && (line[i] != ':'))
-		break;
-	    line[i++] = 0;
+		}
 	}
 
-        if (k < 4) {
-            warnx("%s: line %d: missing field(s)", gfn, n);
-	    for ( ; k < 4; k++)
-		f[k] = empty;
-            e = 1;
-        }
-
-	for (cp = f[0] ; *cp ; cp++) {
-	    if (!isalnum(*cp) && *cp != '.' && *cp != '_' && *cp != '-' &&
-		(cp > f[0] || *cp != '+')) {
-		warnx("%s: line %d: '%c' invalid character", gfn, n, *cp);
-		e = 1;
-	    }
-	}
+	argc -= optind;
+	argv += optind;
 
-	for (cp = f[3] ; *cp ; cp++) {
-	    if (!isalnum(*cp) && *cp != '.' && *cp != '_' && *cp != '-' &&
-			*cp != ',') {
-		warnx("%s: line %d: '%c' invalid character", gfn, n, *cp);
-		e = 1;
-	    }
-	}
+	if (argc == 0)
+		gfn = "/etc/group";
+	else if (argc == 1)
+		gfn = argv[0];
+	else
+		usage();
 
-	/* check if fourth field ended with a colon */
-	if (i < len) {
-	    warnx("%s: line %d: too many fields", gfn, n);
-	    e = 1;
-	}
+	/* open group file */
+	if ((gf = fopen(gfn, "r")) == NULL)
+		err(EX_NOINPUT, "%s", gfn);
+
+	/* check line by line */
+	while (++n) {
+		if ((line = fgetln(gf, &len)) == NULL)
+			break;
+		if (len > 0 && line[len - 1] != '\n') {
+			warnx("%s: line %d: no newline character", gfn, n);
+			e = 1;
+		}
+		while (len && isspace(line[len-1]))
+			len--;
+
+		/* ignore blank lines and comments */
+		for (p = line; p < line + len; p++)
+			if (!isspace(*p)) break;
+		if (!len || *p == '#')
+			continue;
+
+		/*
+		 * Hack: special case for + line
+		 */
+		if (strncmp(line, "+:::", len) == 0)
+			continue;
+
+		/*
+		 * A correct group entry has four colon-separated fields,
+		 * the third of which must be entirely numeric and the
+		 * fourth of which may be empty.
+		 */
+		for (i = k = 0; k < 4; k++) {
+			for (f[k] = line + i; i < len && line[i] != ':'; i++)
+				/* nothing */ ;
+			if (k < 3 && line[i] != ':')
+				break;
+			line[i++] = 0;
+		}
+
+		if (k < 4) {
+			warnx("%s: line %d: missing field(s)", gfn, n);
+			while (k < 4)
+				f[k++] = "";
+			e = 1;
+		}
+
+		for (cp = f[0] ; *cp ; cp++) {
+			if (!isalnum(*cp) && *cp != '.' && *cp != '_' &&
+			    *cp != '-' && (cp > f[0] || *cp != '+')) {
+				warnx("%s: line %d: '%c' invalid character",
+				    gfn, n, *cp);
+				e = 1;
+			}
+		}
+
+		for (cp = f[3] ; *cp ; cp++) {
+			if (!isalnum(*cp) && *cp != '.' && *cp != '_' &&
+			    *cp != '-' && *cp != ',') {
+				warnx("%s: line %d: '%c' invalid character",
+				    gfn, n, *cp);
+				e = 1;
+			}
+		}
+
+		/* check if fourth field ended with a colon */
+		if (i < len) {
+			warnx("%s: line %d: too many fields", gfn, n);
+			e = 1;
+		}
 	
-	/* check that none of the fields contain whitespace */
-	for (k = 0; k < 4; k++) {
-	    if (strcspn(f[k], " \t") != strlen(f[k])) {
-		warnx("%s: line %d: field %d contains whitespace",
-		      gfn, n, k+1);
-		e = 1;
-	    }
+		/* check that none of the fields contain whitespace */
+		for (k = 0; k < 4; k++) {
+			if (strcspn(f[k], " \t") != strlen(f[k])) {
+				warnx("%s: line %d: field %d contains whitespace",
+				    gfn, n, k+1);
+				e = 1;
+			}
+		}
+
+		/* check that the GID is numeric */
+		if (strspn(f[2], "0123456789") != strlen(f[2])) {
+			warnx("%s: line %d: group id is not numeric", gfn, n);
+			e = 1;
+		}
+
+		/* check the range of the group id */
+		errno = 0;
+		gid = strtoul(f[2], NULL, 10);
+		if (errno != 0) {
+			warnx("%s: line %d: strtoul failed", gfn, n);
+		} else if (gid > GID_MAX) {
+			warnx("%s: line %d: group id is too large (%ju > %ju)",
+			    gfn, n, (uintmax_t)gid, (uintmax_t)GID_MAX);
+			e = 1;
+		}
 	}
 
-	/* check that the GID is numeric */
-	if (strspn(f[2], "0123456789") != strlen(f[2])) {
-	    warnx("%s: line %d: GID is not numeric", gfn, n);
-	    e = 1;
-	}
+	/* check what broke the loop */
+	if (ferror(gf))
+		err(EX_IOERR, "%s: line %d", gfn, n);
 
-	/* check the range of the group id */
-	errno = 0;
-	unsigned long groupid = strtoul(f[2], NULL, 10);
-	if (errno != 0) {
-		warnx("%s: line %d: strtoul failed", gfn, n);
-	}
-	else if (groupid > GID_MAX) {
-		warnx("%s: line %d: group id is too large (> %ju)",
-		  gfn, n, (uintmax_t)GID_MAX);
-		e = 1;
-	}
-	
-#if 0
-	/* entry is correct, so print it */
-	printf("%s:%s:%s:%s\n", f[0], f[1], f[2], f[3]);
-#endif	
-    }
-
-    /* check what broke the loop */
-    if (ferror(gf))
-	err(EX_IOERR, "%s: line %d", gfn, n);
-
-    /* done */
-    fclose(gf);
-    if (e == 0 && quiet == 0)
-	printf("%s is fine\n", gfn);
-    exit(e ? EX_DATAERR : EX_OK);
+	/* done */
+	fclose(gf);
+	if (e == 0 && quiet == 0)
+		printf("%s is fine\n", gfn);
+	exit(e ? EX_DATAERR : EX_OK);
 }