Berkeley copyright

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

diff --git a/usr/src/usr.bin/last/last.c b/usr/src/usr.bin/last/last.c
index 750ba73..1017e36 100644 (file)
--- a/usr/src/usr.bin/last/last.c
+++ b/usr/src/usr.bin/last/last.c
@@ -1,18 +1,29 @@
 /*
 /*

- * 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) 1987 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * 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
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1987 Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)last.c     5.8 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)last.c     5.11 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * last
 
 /*
  * last


@@ -333,7 +344,7 @@ ttyconv(arg)
                        fputs("last: malloc failure.\n", stderr);
                        exit(1);
                }
                        fputs("last: malloc failure.\n", stderr);
                        exit(1);
                }

-               if (!strcmp(optarg, "co"))
+               if (!strcmp(arg, "co"))

                        (void)strcpy(mval, "console");
                else {
                        (void)strcpy(mval, "tty");
                        (void)strcpy(mval, "console");
                else {
                        (void)strcpy(mval, "tty");