Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/mkdir.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/mkdir.c (modified) (3 diffs)

branches/3.3/mindi-busybox/coreutils/mkdir.c

@@ -49 +49 @@
     "context\0" Required_argument "Z"
 #endif
+#if ENABLE_FEATURE_VERBOSE
     "verbose\0" No_argument       "v"
+#endif
     ;
 #endif
@@ -68 +70 @@
     applet_long_options = mkdir_longopts;
 #endif
-    opt = getopt32(argv, "m:p" IF_SELINUX("Z:") "v", &smode IF_SELINUX(,&scontext));
+    opt = getopt32(argv, "m:pv" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
     if (opt & 1) {
-        mode_t mmode = 0777;
-        if (!bb_parse_mode(smode, &mmode)) {
+        mode_t mmode = bb_parse_mode(smode, 0777);
+        if (mmode == (mode_t)-1) {
             bb_error_msg_and_die("invalid mode '%s'", smode);
         }
@@ -78 +80 @@
     if (opt & 2)
         flags |= FILEUTILS_RECUR;
+    if ((opt & 4) && FILEUTILS_VERBOSE)
+        flags |= FILEUTILS_VERBOSE;
 #if ENABLE_SELINUX
-    if (opt & 4) {
+    if (opt & 8) {
         selinux_or_die();
         setfscreatecon_or_die(scontext);