Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/mknod.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/mknod.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/coreutils/mknod.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -15 +15 @@
 #include "libcoreutils/coreutils.h"
 
+/* 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)
 {
@@ -25 +27 @@
     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);
         }
     }