Some corrections, some additions, some embellishments.

[oweals/busybox.git] / mknod.c

diff --git a/mknod.c b/mknod.c
index 40f508d334c6dd8ce0a3beb0cf507c0581824d0d..022ab8571421c99ead06d61921d2996ab50825fd 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -20,31 +20,46 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 
-static const char mknod_usage[] = "mknod NAME TYPE MAJOR MINOR\n\n"
-       "Make block or character special files.\n\n"
-       "TYPEs include:\n"
-       "\tb:\tMake a block (buffered) device.\n"
-
-       "\tc or u:\tMake a character (un-buffered) device.\n"
-       "\tp:\tMake a named pipe. Major and minor are ignored for named pipes.\n";
-
 int mknod_main(int argc, char **argv)
 {
+       char *thisarg;
        mode_t mode = 0;
+       mode_t perm = 0666;
        dev_t dev = 0;
 
-       if (argc != 5 || **(argv + 1) == '-') {
+       argc--;
+       argv++;
+
+       /* Parse any options */
+       while (argc > 1) {
+               if (**argv != '-')
+                       break;
+               thisarg = *argv;
+               thisarg++;
+               switch (*thisarg) {
+               case 'm':
+                       argc--;
+                       argv++;
+                       parse_mode(*argv, &perm);
+                       umask(0);
+                       break;
+               default:
+                       usage(mknod_usage);
+               }
+               argc--;
+               argv++;
+       }
+       if (argc != 4 && argc != 2) {
                usage(mknod_usage);
        }
-       switch (argv[2][0]) {
+       switch (argv[1][0]) {
        case 'c':
        case 'u':
                mode = S_IFCHR;
@@ -54,23 +69,22 @@ int mknod_main(int argc, char **argv)
                break;
        case 'p':
                mode = S_IFIFO;
+               if (argc!=2) {
+                       usage(mknod_usage);
+               }
                break;
        default:
                usage(mknod_usage);
        }
 
        if (mode == S_IFCHR || mode == S_IFBLK) {
-               dev = (atoi(argv[3]) << 8) | atoi(argv[4]);
-               if (argc != 5) {
-                       usage(mknod_usage);
-               }
+               dev = (atoi(argv[2]) << 8) | atoi(argv[3]);
        }
 
-       mode |= 0666;
+       mode |= perm;
 
-       if (mknod(argv[1], mode, dev) != 0) {
-               perror(argv[1]);
-               exit (FALSE);
-       }
-       exit (TRUE);
+       if (mknod(argv[0], mode, dev) != 0)
+               error_msg_and_die("%s: %s\n", argv[0], strerror(errno));
+       return EXIT_SUCCESS;
 }
+