BSD 4_4 release

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

diff --git a/usr/src/sbin/mknod/mknod.c b/usr/src/sbin/mknod/mknod.c
index 6baf5e6..b70acf1 100644 (file)
--- a/usr/src/sbin/mknod/mknod.c
+++ b/usr/src/sbin/mknod/mknod.c
@@ -1,50 +1,82 @@
+/*
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Kevin Fall.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)mknod.c     4.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)mknod.c    8.1 (Berkeley) 6/5/93";
+#endif /* not lint */

 
 

+#include <sys/types.h>
+#include <sys/stat.h>

 #include <stdio.h>
 
 main(argc, argv)
        int argc;
        char **argv;
 {
 #include <stdio.h>
 
 main(argc, argv)
        int argc;
        char **argv;
 {

-       int m, a, b;
+       extern int errno;
+       u_short mode;
+       char *strerror();

 
 

-       if(argc != 5) {
-               printf("arg count\n");
-               goto usage;
+       if (argc != 5) {
+               (void)fprintf(stderr,
+                   "usage: mknod name [b | c] major minor\n");
+               exit(1);

        }
        }

-       if(*argv[2] == 'b')
-               m = 060666; else
-       if(*argv[2] == 'c')
-               m = 020666; else
-               goto usage;
-       a = number(argv[3]);
-       if(a < 0)
-               goto usage;
-       b = number(argv[4]);
-       if(b < 0)
-               goto usage;
-       if(mknod(argv[1], m, (a<<8)|b) < 0) {
-               fprintf(stderr, "mknod: ");
-               perror(argv[1]);
-       }
-       exit(0);

 
 

-usage:
-       printf("usage: mknod name b/c major minor\n");
-}
-
-number(s)
-char *s;
-{
-       int n, c;
+       mode = 0666;
+       if (argv[2][0] == 'c')
+               mode |= S_IFCHR;
+       else if (argv[2][0] == 'b')
+               mode |= S_IFBLK;
+       else {
+               (void)fprintf(stderr,
+                   "mknod: node must be type 'b' or 'c'.\n");
+               exit(1);
+       }

 
 

-       n = 0;
-       while(c = *s++) {
-               if(c<'0' || c>'9')
-                       return(-1);
-               n = n*10 + c-'0';
+       if (mknod(argv[1], mode, makedev(atoi(argv[3]), atoi(argv[4]))) < 0) {
+               (void)fprintf(stderr,
+                   "mknod: %s: %s\n", argv[1], strerror(errno));
+               exit(1);

        }
        }

-       return(n);
+       exit(0);

 }
 }