X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/abe5b3357ade40dd1cd2e3dfe187e7f76ac19f4b..cc4ae314785436aa5868194dbbb0de85d980f722:/usr/src/usr.bin/users/users.c

diff --git a/usr/src/usr.bin/users/users.c b/usr/src/usr.bin/users/users.c
index 4a0a8a8409..9989413747 100644
--- a/usr/src/usr.bin/users/users.c
+++ b/usr/src/usr.bin/users/users.c
@@ -1,97 +1,101 @@
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
  */
 
 #ifndef lint
 char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980, 1987 Regents of the University of California.\n\
  All rights reserved.\n";
-#endif not lint
+#endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)users.c	5.3 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)users.c	5.12 (Berkeley) 11/1/90";
+#endif /* not lint */
 
-/*
- * users
- */
 #include <sys/types.h>
 #include <utmp.h>
 #include <stdio.h>
 
-#define ERREXIT		1
-#define OKEXIT		0
-#define NMAX		sizeof(utmp.ut_name)
-#define MAXUSERS	200
+#define	MAXUSERS	200
 
-static struct utmp	utmp;		/* read structure */
-static int	ncnt;			/* count of names */
-static char	*names[MAXUSERS],	/* names table */
-		**namp;			/* pointer to names table */
-
-main(argc,argv)
-int	argc;
-char	**argv;
+main(argc, argv)
+	int argc;
+	char **argv;
 {
-	register FILE	*fp;		/* file pointer */
-	char	*fname;
+	extern int optind;
+	register int cnt, ncnt;
+	struct utmp utmp;
+	char names[MAXUSERS][UT_NAMESIZE];
+	int ch, scmp();
 
-	if (argc > 2) {
-		fputs("usage: users [ utmp_file ]\n",stderr);
-		exit(ERREXIT);
-	}
-	fname = argc == 2 ? argv[1] : "/etc/utmp";
-	if (!(fp = fopen(fname,"r"))) {
-		perror(fname);
-		exit(ERREXIT);
+	while ((ch = getopt(argc, argv, "")) != EOF)
+		switch(ch) {
+		case '?':
+		default:
+			(void)fprintf(stderr, "usage: users\n");
+			exit(1);
+		}
+	argc -= optind;
+	argv += optind;
+
+	if (!freopen(_PATH_UTMP, "r", stdin)) {
+		(void)fprintf(stderr, "users: can't open %s.\n", _PATH_UTMP);
+		exit(1);
 	}
-	namp = names;
-	while (fread((char *)&utmp,sizeof(utmp),1,fp) == 1)
+	for (ncnt = 0;
+	    fread((char *)&utmp, sizeof(utmp), 1, stdin) == 1;)
 		if (*utmp.ut_name) {
-			if (++ncnt > MAXUSERS) {
-				ncnt = MAXUSERS;
-				fputs("users: too many users.\n",stderr);
+			if (ncnt == MAXUSERS) {
+				(void)fprintf(stderr,
+				    "users: too many users.\n");
 				break;
 			}
-			nsave();
+			(void)strncpy(names[ncnt], utmp.ut_name, UT_NAMESIZE);
+			++ncnt;
 		}
-	if (ncnt)
-		summary();
-	exit(OKEXIT);
-}
-
-nsave()
-{
-	char	*calloc();
-
-	if (!(*namp = calloc((u_int)(NMAX + 1),sizeof(char)))) {
-		fputs("users: malloc error.\n",stderr);
-		exit(ERREXIT);
-	}
-	bcopy(utmp.ut_name,*namp++,NMAX);
-}
-
-summary()
-{
-	register char	**p,
-			**q;
-	int	scmp();
 
-	qsort((char *)names,ncnt,sizeof(names[0]),scmp);
-	for (p = names;p < namp;p = q) {
-		if (p != names)
-			putchar(' ');
-		fputs(*p,stdout);
-		for (q = p + 1;q < namp && !strcmp(*q,*p);++q);
+	if (ncnt) {
+		qsort(names, ncnt, UT_NAMESIZE, scmp);
+		(void)printf("%.*s", UT_NAMESIZE, names[0]);
+		for (cnt = 1; cnt < ncnt; ++cnt)
+			if (strncmp(names[cnt], names[cnt - 1], UT_NAMESIZE))
+				(void)printf(" %.*s", UT_NAMESIZE, names[cnt]);
+		(void)printf("\n");
 	}
-	putchar('\n');
+	exit(0);
 }
 
-scmp(p,q)
-char	**p,
-	**q;
+scmp(p, q)
+	char *p, *q;
 {
-	return(strcmp(*p,*q));
+	return(strncmp(p, q, UT_NAMESIZE));
 }