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 99d50aa..ec32c1b 100644 (file)
--- a/usr/src/usr.sbin/config/mkswapconf.c
+++ b/usr/src/usr.sbin/config/mkswapconf.c
@@ -1,6 +1,23 @@
+/*
+ * Copyright (c) 1980 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
 #ifndef lint

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

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


@@ -30,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;
 


@@ -112,7 +129,7 @@ nametodev(name, defunit, defpartition)
        while (*cp && !isdigit(*cp))
                cp++;
        unit = *cp ? atoi(cp) : defunit;
        while (*cp && !isdigit(*cp))
                cp++;
        unit = *cp ? atoi(cp) : defunit;

-       if (unit < 0 || unit > 7) {
+       if (unit < 0 || unit > 31) {

                fprintf(stderr,
 "config: %s: invalid device specification, unit out of range\n", name);
                unit = defunit;                 /* carry on more checking */
                fprintf(stderr,
 "config: %s: invalid device specification, unit out of range\n", name);
                unit = defunit;                 /* carry on more checking */


@@ -130,7 +147,7 @@ nametodev(name, defunit, defpartition)
        }
        if (devtablenotread)
                initdevtable();
        }
        if (devtablenotread)
                initdevtable();

-       for (dp = devtable; dp->dev_next; dp = dp->dev_next)
+       for (dp = devtable; dp; dp = dp->dev_next)

                if (eq(name, dp->dev_name))
                        break;
        if (dp == 0) {
                if (eq(name, dp->dev_name))
                        break;
        if (dp == 0) {


@@ -149,12 +166,12 @@ devtoname(dev)
 
        if (devtablenotread)
                initdevtable();
 
        if (devtablenotread)
                initdevtable();

-       for (dp = devtable; dp->dev_next; dp = dp->dev_next)
+       for (dp = devtable; dp; dp = dp->dev_next)

                if (major(dev) == dp->dev_major)
                        break;
        if (dp == 0)
                dp = devtable;
                if (major(dev) == dp->dev_major)
                        break;
        if (dp == 0)
                dp = devtable;

-       sprintf(buf, "%s%d%c", dp->dev_name,
+       (void) sprintf(buf, "%s%d%c", dp->dev_name,

                minor(dev) >> 3, (minor(dev) & 07) + 'a');
        return (ns(buf));
 }
                minor(dev) >> 3, (minor(dev) & 07) + 'a');
        return (ns(buf));
 }


@@ -166,7 +183,7 @@ initdevtable()
        register struct devdescription **dp = &devtable;
        FILE *fp;
 
        register struct devdescription **dp = &devtable;
        FILE *fp;
 

-       sprintf(buf, "../conf/devices.%s", machinename);
+       (void) sprintf(buf, "../conf/devices.%s", machinename);

        fp = fopen(buf, "r");
        if (fp == NULL) {
                fprintf(stderr, "config: can't open %s\n", buf);
        fp = fopen(buf, "r");
        if (fp == NULL) {
                fprintf(stderr, "config: can't open %s\n", buf);