whitespace fixes

[oweals/busybox.git] / coreutils / mknod.c

diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index ea2331fa3177b5f124fc0aedb3f15fc2241c53de..55f53103398bef84bf729a186c2a94ace91f34d5 100644 (file)
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -1,51 +1,57 @@
-#include "internal.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 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)
+/* vi: set sw=4 ts=4: */
+/*
+ * mknod implementation for busybox
+ *
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+
+#include <sys/sysmacros.h>  // For makedev
+
+#include "libbb.h"
+#include "libcoreutils/coreutils.h"
+
+static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
+static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
+
+int mknod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mknod_main(int argc, char **argv)
 {
-       mode_t  mode = 0;
-       dev_t   dev = 0;
-
-       switch(argv[2][0]) {
-       case 'c':
-       case 'u':
-               mode = S_IFCHR;
-               break;
-       case 'b':
-               mode = S_IFBLK;
-               break;
-       case 'p':
-               mode = S_IFIFO;
-               break;
-       default:
-               usage (mknod_usage);
-       }
+       mode_t mode;
+       dev_t dev;
+       const char *name;
 
-       if ( mode == S_IFCHR || mode == S_IFBLK ) {
-               dev = (atoi(argv[3]) << 8) | atoi(argv[4]);
-               if ( argc != 5 ) {
-                   usage (mknod_usage);
-               }
-       }
+       mode = getopt_mk_fifo_nod(argc, argv);
+       argv += optind;
+       argc -= optind;
 
-       mode |= 0666;
+       if (argc >= 2) {
+               name = strchr(modes_chars, argv[1][0]);
+               if (name != NULL) {
+                       mode |= modes_cubp[(int)(name[4])];
 
-       if ( mknod(argv[1], mode, dev) != 0 ) {
-               perror(argv[1]);
-               return( FALSE);
+                       dev = 0;
+                       if (*name != 'p') {
+                               argc -= 2;
+                               if (argc == 2) {
+                                       /* Autodetect what the system supports; these macros should
+                                        * optimize out to two constants. */
+                                       dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
+                                                     xatoul_range(argv[3], 0, minor(UINT_MAX)));
+                               }
+                       }
+
+                       if (argc == 2) {
+                               name = *argv;
+                               if (mknod(name, mode, dev) == 0) {
+                                       return EXIT_SUCCESS;
+                               }
+                               bb_simple_perror_msg_and_die(name);
+                       }
+               }
        }
-       return( TRUE);
+       bb_show_usage();
 }