Make cin be static

[oweals/busybox.git] / mknod.c

diff --git a/mknod.c b/mknod.c
index 0c93df64da3483e9c191513edc95f293942965d2..4d8c598ead16c7eeaf5cbcf7792f5fe459ba538e 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -20,23 +20,13 @@
  *
  */
 
-#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 [OPTIONS] NAME TYPE MAJOR MINOR\n\n"
-       "Create a special file (block, character, or pipe).\n\n"
-       "Options:\n"
-       "\t-m\tcreate the special file using the specified mode (default a=rw)\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;
@@ -58,6 +48,7 @@ int mknod_main(int argc, char **argv)
                        argc--;
                        argv++;
                        parse_mode(*argv, &perm);
+                       umask(0);
                        break;
                default:
                        usage(mknod_usage);
@@ -87,13 +78,13 @@ int mknod_main(int argc, char **argv)
        }
 
        if (mode == S_IFCHR || mode == S_IFBLK) {
-               dev = (atoi(argv[2]) << 8) | atoi(argv[1]);
+               dev = (atoi(argv[2]) << 8) | atoi(argv[3]);
        }
 
        mode |= perm;
 
        if (mknod(argv[0], mode, dev) != 0)
-               fatalError("%s: %s\n", argv[0], strerror(errno));
-       exit (TRUE);
+               perror_msg_and_die("%s", argv[0]);
+       return EXIT_SUCCESS;
 }