BSD 4_4 release

[unix-history] / 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 0f20b69..11571f2 100644 (file)
--- a/usr/src/usr.bin/users/users.c
+++ b/usr/src/usr.bin/users/users.c
@@ -1,45 +1,71 @@
 /*
 /*

- * Copyright (c) 1980, 1987 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1987, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1980, 1987 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1987, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)users.c    5.9 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)users.c    8.1 (Berkeley) 6/6/93";

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

-#include <errno.h>

 #include <utmp.h>
 #include <stdio.h>
 
 #define        MAXUSERS        200
 
 #include <utmp.h>
 #include <stdio.h>
 
 #define        MAXUSERS        200
 

-main()
+main(argc, argv)
+       int argc;
+       char **argv;

 {
 {

+       extern int optind;

        register int cnt, ncnt;
        struct utmp utmp;
        char names[MAXUSERS][UT_NAMESIZE];
        register int cnt, ncnt;
        struct utmp utmp;
        char names[MAXUSERS][UT_NAMESIZE];

-       int scmp();
+       int ch, scmp();
+
+       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);
 
        if (!freopen(_PATH_UTMP, "r", stdin)) {
                (void)fprintf(stderr, "users: can't open %s.\n", _PATH_UTMP);


@@ -59,13 +85,10 @@ main()
 
        if (ncnt) {
                qsort(names, ncnt, UT_NAMESIZE, scmp);
 
        if (ncnt) {
                qsort(names, ncnt, UT_NAMESIZE, scmp);

-               (void)printf("%s", names[0]);
-               for (cnt = 1; cnt < ncnt; ++cnt) {
-                       while (cnt < ncnt - 1 &&
-                           !strncmp(names[cnt], names[cnt + 1], UT_NAMESIZE))
-                               ++cnt;
-                       (void)printf(" %.*s", UT_NAMESIZE, names[cnt]);
-               }
+               (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");
        }
        exit(0);
                (void)printf("\n");
        }
        exit(0);


@@ -74,5 +97,5 @@ main()
 scmp(p, q)
        char *p, *q;
 {
 scmp(p, q)
        char *p, *q;
 {

-       return(strcmp(p, q));
+       return(strncmp(p, q, UT_NAMESIZE));

 }
 }