[Midnightbsd-cvs] src [10861] trunk/usr.sbin/chkgrp/chkgrp.c: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jun 13 18:27:39 EDT 2018
Revision: 10861
http://svnweb.midnightbsd.org/src/?rev=10861
Author: laffer1
Date: 2018-06-13 18:27:38 -0400 (Wed, 13 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/usr.sbin/chkgrp/Makefile
trunk/usr.sbin/chkgrp/chkgrp.8
trunk/usr.sbin/chkgrp/chkgrp.c
Property Changed:
----------------
trunk/usr.sbin/chkgrp/chkgrp.8
Modified: trunk/usr.sbin/chkgrp/Makefile
===================================================================
--- trunk/usr.sbin/chkgrp/Makefile 2018-06-13 22:25:00 UTC (rev 10860)
+++ trunk/usr.sbin/chkgrp/Makefile 2018-06-13 22:27:38 UTC (rev 10861)
@@ -1,8 +1,7 @@
-# $FreeBSD: src/usr.sbin/chkgrp/Makefile,v 1.7 2001/07/20 06:19:39 obrien Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/chkgrp/Makefile 201390 2010-01-02 11:07:44Z ed $
PROG= chkgrp
MAN= chkgrp.8
-WARNS?= 2
-
.include <bsd.prog.mk>
Modified: trunk/usr.sbin/chkgrp/chkgrp.8
===================================================================
--- trunk/usr.sbin/chkgrp/chkgrp.8 2018-06-13 22:25:00 UTC (rev 10860)
+++ trunk/usr.sbin/chkgrp/chkgrp.8 2018-06-13 22:27:38 UTC (rev 10861)
@@ -1,4 +1,5 @@
-.\" Copyright (c) 1998 Dag-Erling Co\xEFdan Sm\xF8rgrav
+.\" $MidnightBSD$
+.\" Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.16 2005/06/14 12:26:34 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/chkgrp/chkgrp.8 243084 2012-11-15 15:16:50Z eadler $
.\"
.Dd May 26, 2005
.Dt CHKGRP 8
Property changes on: trunk/usr.sbin/chkgrp/chkgrp.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/chkgrp/chkgrp.c
===================================================================
--- trunk/usr.sbin/chkgrp/chkgrp.c 2018-06-13 22:25:00 UTC (rev 10860)
+++ trunk/usr.sbin/chkgrp/chkgrp.c 2018-06-13 22:27:38 UTC (rev 10861)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
/*-
- * Copyright (c) 1998 Dag-Erling Co\xEFdan Sm\xF8rgrav
+ * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,10 +28,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/chkgrp/chkgrp.c,v 1.11 2005/08/25 17:01:06 cperciva Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/chkgrp/chkgrp.c 284994 2015-07-01 07:31:39Z des $");
#include <err.h>
+#include <errno.h>
#include <ctype.h>
+#include <limits.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -37,143 +41,152 @@
#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;
+ 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 ((ch = getopt(argc, argv, "q")) != -1) {
- switch (ch) {
+ quiet = 0;
+ while ((opt = getopt(argc, argv, "q")) != -1) {
+ switch (opt) {
case 'q':
quiet = 1;
break;
- case '?':
default:
- printf("hello\n");
usage();
- }
- }
+ }
+ }
- if (optind == argc)
- gfn = "/etc/group";
- else if (optind == argc - 1)
- gfn = argv[optind];
- else
- usage();
+ argc -= optind;
+ argv += optind;
- /* open group file */
- if ((gf = fopen(gfn, "r")) == NULL)
- err(EX_NOINPUT, "%s", gfn);
+ if (argc == 0)
+ gfn = "/etc/group";
+ else if (argc == 1)
+ gfn = argv[0];
+ else
+ usage();
- /* 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++;
- }
- while (len && isspace(line[len-1]))
- len--;
+ /* open group file */
+ if ((gf = fopen(gfn, "r")) == NULL)
+ err(EX_NOINPUT, "%s", gfn);
- /* 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;
- }
+ /* 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--;
- if (k < 4) {
- warnx("%s: line %d: missing field(s)", gfn, n);
- for ( ; k < 4; k++)
- f[k] = empty;
- e++;
- }
+ /* ignore blank lines and comments */
+ for (p = line; p < line + len; p++)
+ if (!isspace(*p)) break;
+ if (!len || *p == '#')
+ continue;
- 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++;
- }
- }
+ /*
+ * Hack: special case for + line
+ */
+ if (strncmp(line, "+:::", len) == 0)
+ continue;
- for (cp = f[3] ; *cp ; cp++) {
- if (!isalnum(*cp) && *cp != '.' && *cp != '_' && *cp != '-' &&
- *cp != ',') {
- warnx("%s: line %d: '%c' invalid character", gfn, n, *cp);
- e++;
- }
- }
+ /*
+ * 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;
+ }
- /* check if fourth field ended with a colon */
- if (i < len) {
- warnx("%s: line %d: too many fields", gfn, n);
- e++;
- }
+ 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++;
- }
- }
+ /* 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: GID is not numeric", gfn, n);
- e++;
+ /* 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;
+ }
}
-
-#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);
+ /* 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);
}
More information about the Midnightbsd-cvs
mailing list