Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/mkdir.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/mkdir.c (modified) (4 diffs)

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

@@ -20 +20 @@
  */
 
+//usage:#define mkdir_trivial_usage
+//usage:       "[OPTIONS] DIRECTORY..."
+//usage:#define mkdir_full_usage "\n\n"
+//usage:       "Create DIRECTORY\n"
+//usage:     "\n    -m MODE Mode"
+//usage:     "\n    -p  No error if exists; make parent directories as needed"
+//usage:    IF_SELINUX(
+//usage:     "\n    -Z  Set security context"
+//usage:    )
+//usage:
+//usage:#define mkdir_example_usage
+//usage:       "$ mkdir /tmp/foo\n"
+//usage:       "$ mkdir /tmp/foo\n"
+//usage:       "/tmp/foo: File exists\n"
+//usage:       "$ mkdir /tmp/foo/bar/baz\n"
+//usage:       "/tmp/foo/bar/baz: No such file or directory\n"
+//usage:       "$ mkdir -p /tmp/foo/bar/baz\n"
+
 #include "libbb.h"
 
@@ -31 +49 @@
     "context\0" Required_argument "Z"
 #endif
+    "verbose\0" No_argument       "v"
     ;
 #endif
@@ -37 +56 @@
 int mkdir_main(int argc UNUSED_PARAM, char **argv)
 {
-    mode_t mode = (mode_t)(-1);
+    long mode = -1;
     int status = EXIT_SUCCESS;
     int flags = 0;
@@ -49 +68 @@
     applet_long_options = mkdir_longopts;
 #endif
-    opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
+    opt = getopt32(argv, "m:p" IF_SELINUX("Z:") "v", &smode IF_SELINUX(,&scontext));
     if (opt & 1) {
-        mode = 0777;
-        if (!bb_parse_mode(smode, &mode)) {
+        mode_t mmode = 0777;
+        if (!bb_parse_mode(smode, &mmode)) {
             bb_error_msg_and_die("invalid mode '%s'", smode);
         }
+        mode = mmode;
     }
     if (opt & 2)