use setpassent, not _pw_stayopen

[unix-history] / usr / src / usr.bin / lastcomm / lastcomm.c

diff --git a/usr/src/usr.bin/lastcomm/lastcomm.c b/usr/src/usr.bin/lastcomm/lastcomm.c
index 29c9f56..53ac675 100644 (file)
--- a/usr/src/usr.bin/lastcomm/lastcomm.c
+++ b/usr/src/usr.bin/lastcomm/lastcomm.c
@@ -3,11 +3,16 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -17,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)lastcomm.c 5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)lastcomm.c 5.7 (Berkeley) %G%";

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


@@ -72,6 +77,7 @@ main(argc, argv)
                exit(1);
        }
        (void)fstat(fd, &sb);
                exit(1);
        }
        (void)fstat(fd, &sb);

+       setpassent(1);

        for (bn = btodb(sb.st_size); bn >= 0; bn--) {
                (void)lseek(fd, (off_t)dbtob(bn), L_SET);
                cc = read(fd, buf, DEV_BSIZE);
        for (bn = btodb(sb.st_size); bn >= 0; bn--) {
                (void)lseek(fd, (off_t)dbtob(bn), L_SET);
                cc = read(fd, buf, DEV_BSIZE);


@@ -168,7 +174,6 @@ char *
 getname(uid)
        uid_t uid;
 {
 getname(uid)
        uid_t uid;
 {

-       extern int _pw_stayopen;

        static struct ncache {
                uid_t   uid;
                char    name[NMAX+1];
        static struct ncache {
                uid_t   uid;
                char    name[NMAX+1];


@@ -176,7 +181,6 @@ getname(uid)
        register struct passwd *pw;
        register struct ncache *cp;
 
        register struct passwd *pw;
        register struct ncache *cp;
 

-       _pw_stayopen = 1;

        cp = c_uid + (uid & CAMASK);
        if (cp->uid == uid && *cp->name)
                return(cp->name);
        cp = c_uid + (uid & CAMASK);
        if (cp->uid == uid && *cp->name)
                return(cp->name);