Move the warning msg after features.h gets pulled in.

[oweals/busybox.git] / mknod.c

diff --git a/mknod.c b/mknod.c
index 81c846b98dbd950ee02173ebd67dd5bd26707e3b..b4d4b82a109cba977bffc206c16da96359f0c8a7 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mknod implementation for busybox
  *
@@ -19,28 +20,48 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include "busybox.h"
 
-static const char mknod_usage[] = "mknod file b|c|u|p major minor\n"
-"\tMake special files.\n"
-"\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)
+int mknod_main(int argc, char **argv)
 {
-       mode_t  mode = 0;
-       dev_t   dev = 0;
+       char *thisarg;
+       mode_t mode = 0;
+       mode_t perm = 0666;
+       dev_t dev = 0;
 
-       switch(argv[2][0]) {
+       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:
+                       show_usage();
+               }
+               argc--;
+               argv++;
+       }
+       if (argc != 4 && argc != 2) {
+               show_usage();
+       }
+       switch (argv[1][0]) {
        case 'c':
        case 'u':
                mode = S_IFCHR;
@@ -50,23 +71,22 @@ mknod_main(int argc, char** argv)
                break;
        case 'p':
                mode = S_IFIFO;
+               if (argc!=2) {
+                       show_usage();
+               }
                break;
        default:
-               usage (mknod_usage);
+               show_usage();
        }
 
-       if ( mode == S_IFCHR || mode == S_IFBLK ) {
-               dev = (atoi(argv[3]) << 8) | atoi(argv[4]);
-               if ( argc != 5 ) {
-                   usage (mknod_usage);
-               }
+       if (mode == S_IFCHR || mode == S_IFBLK) {
+               dev = (atoi(argv[2]) << 8) | atoi(argv[3]);
        }
 
-       mode |= 0666;
+       mode |= perm;
 
-       if ( mknod(argv[1], mode, dev) != 0 ) {
-               perror(argv[1]);
-               return( FALSE);
-       }
-       return( TRUE);
+       if (mknod(argv[0], mode, dev) != 0)
+               perror_msg_and_die("%s", argv[0]);
+       return EXIT_SUCCESS;
 }
+