test: recognize /path/to/[ case too

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

diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 5822cd3adb120daf0117c9d56b4ce37c30e8aec0..415ef55c167661b003c5676189bfbb2da705d427 100644 (file)
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -1,75 +1,51 @@
+/* vi: set sw=4 ts=4: */
 /*
- * Mini mknod implementation for busybox
+ * mknod implementation for busybox
  *
- * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-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";
+#include <sys/sysmacros.h>  // For makedev
 
-int
-mknod_main(int argc, char** argv)
+#include "libbb.h"
+#include "libcoreutils/coreutils.h"
+
+static const char modes_chars[] = { '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);
+int mknod_main(int argc, char **argv)
 {
-       mode_t  mode = 0;
-       dev_t   dev = 0;
+       mode_t mode;
+       dev_t dev;
+       const char *name;
 
-       if ( argc != 5 || **(argv+1) == '-' ) {
-           usage (mknod_usage);
-       }
-       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 = getopt_mk_fifo_nod(argc, argv);
+       argv += optind;
+       argc -= optind;
 
-       if ( mode == S_IFCHR || mode == S_IFBLK ) {
-               dev = (atoi(argv[3]) << 8) | atoi(argv[4]);
-               if ( argc != 5 ) {
-                   usage (mknod_usage);
-               }
-       }
+       if ((argc >= 2) && ((name = strchr(modes_chars, argv[1][0])) != NULL)) {
+               mode |= modes_cubp[(int)(name[4])];
 
-       mode |= 0666;
+               dev = 0;
+               if ((*name != 'p') && ((argc -= 2) == 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 ( mknod(argv[1], mode, dev) != 0 ) {
-               perror(argv[1]);
-               return( FALSE);
+               if (argc == 2) {
+                       name = *argv;
+                       if (mknod(name, mode, dev) == 0) {
+                               return EXIT_SUCCESS;
+                       }
+                       bb_perror_msg_and_die("%s", name);
+               }
        }
-       return( TRUE);
+       bb_show_usage();
 }