Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / mknod.c

diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 6fa6d83..aa04504 100644 (file)
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -4,47 +4,72 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
+//usage:#define mknod_trivial_usage
+//usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
+//usage:#define mknod_full_usage "\n\n"
+//usage:       "Create a special file (block, character, or pipe)\n"
+//usage:     "\n       -m MODE Creation mode (default a=rw)"
+//usage:       IF_SELINUX(
+//usage:     "\n       -Z      Set security context"
+//usage:       )
+//usage:     "\nTYPE:"
+//usage:     "\n       b       Block device"
+//usage:     "\n       c or u  Character device"
+//usage:     "\n       p       Named pipe (MAJOR and MINOR are ignored)"
+//usage:
+//usage:#define mknod_example_usage
+//usage:       "$ mknod /dev/fd0 b 2 0\n"
+//usage:       "$ mknod -m 644 /tmp/pipe p\n"
+
 #include <sys/sysmacros.h>  // For makedev
 
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
-static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
+/* This is a NOEXEC applet. Be very careful! */
+
+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);
+int mknod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mknod_main(int argc, char **argv)
 {
        mode_t mode;
        dev_t dev;
        const char *name;
 
-       mode = getopt_mk_fifo_nod(argc, argv);
+       mode = getopt_mk_fifo_nod(argv);
        argv += optind;
        argc -= optind;
 
-       if ((argc >= 2) && ((name = strchr(modes_chars, argv[1][0])) != NULL)) {
-               mode |= modes_cubp[(int)(name[4])];
+       if (argc >= 2) {
+               name = strchr(modes_chars, argv[1][0]);
+               if (name != NULL) {
+                       mode |= modes_cubp[(int)(name[4])];
 
-               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)));
-               }
+                       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;
+                       if (argc == 2) {
+                               name = *argv;
+                               if (mknod(name, mode, dev) == 0) {
+                                       return EXIT_SUCCESS;
+                               }
+                               bb_simple_perror_msg_and_die(name);
                        }
-                       bb_perror_msg_and_die("%s", name);
                }
        }
        bb_show_usage();