install correct aliases file

[unix-history] / usr / src / usr.sbin / config / mkswapconf.c

diff --git a/usr/src/usr.sbin/config/mkswapconf.c b/usr/src/usr.sbin/config/mkswapconf.c
index 9f3e750..ec32c1b 100644 (file)
--- a/usr/src/usr.sbin/config/mkswapconf.c
+++ b/usr/src/usr.sbin/config/mkswapconf.c
@@ -1,12 +1,23 @@
 /*
  * Copyright (c) 1980 Regents of the University of California.
 /*
  * Copyright (c) 1980 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
  */
 
 #ifndef lint

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

 
 /*
  * Build a swap configuration file.
 
 /*
  * Build a swap configuration file.


@@ -36,7 +47,7 @@ do_swap(fl)
        register struct file_list *fl;
 {
        FILE *fp;
        register struct file_list *fl;
 {
        FILE *fp;

-       char  swapname[80], *cp;
+       char  swapname[80];

        register struct file_list *swap;
        dev_t dev;
 
        register struct file_list *swap;
        dev_t dev;