minor cleanups for cray

[unix-history] / usr / src / usr.sbin / vipw / vipw.c

diff --git a/usr/src/usr.sbin/vipw/vipw.c b/usr/src/usr.sbin/vipw/vipw.c
index 0cef21e..9cddf08 100644 (file)
--- a/usr/src/usr.sbin/vipw/vipw.c
+++ b/usr/src/usr.sbin/vipw/vipw.c
@@ -1,18 +1,29 @@
 /*
  * Copyright (c) 1987 Regents of the University of California.
 /*
  * Copyright (c) 1987 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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[] =
 "@(#) Copyright (c) 1987 Regents of the University of California.\n\
  All rights reserved.\n";
  */
 
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1987 Regents of the University of California.\n\
  All rights reserved.\n";

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

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)vipw.c     5.3 (Berkeley) %G%";
-#endif /* !lint */
+static char sccsid[] = "@(#)vipw.c     5.5 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <machine/machparam.h>
 #include <sys/types.h>
 
 #include <machine/machparam.h>
 #include <sys/types.h>


@@ -32,7 +43,7 @@ main()
        register int n, fd_passwd, fd_temp;
        static char *temp = "/etc/ptmp";
        struct stat s1, s2;
        register int n, fd_passwd, fd_temp;
        static char *temp = "/etc/ptmp";
        struct stat s1, s2;

-       char    *editor, *getenv();
+       char *editor, *getenv();

 
        (void)signal(SIGHUP, SIG_IGN);
        (void)signal(SIGINT, SIG_IGN);
 
        (void)signal(SIGHUP, SIG_IGN);
        (void)signal(SIGINT, SIG_IGN);