- backout using features which are not available with the previous stable

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 03c49f0983cfa96486cc3d09c5c35c3619a112a1..48a95badbc760419b3548a6683d55d6b287e481e 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -20,45 +20,56 @@
  *
  */
 
-#include <errno.h>
-#include <getopt.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/mkdir.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Fixed broken permission setting when -p was used; especially in
+ * conjunction with -m.
+ */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h> /* struct option */
 #include "busybox.h"
 
-extern int mkdir_main (int argc, char **argv)
+static const struct option mkdir_long_options[] = {
+       { "mode", 1, NULL, 'm' },
+       { "parents", 0, NULL, 'p' },
+       { 0, 0, 0, 0 }
+};
+
+int mkdir_main (int argc, char **argv)
 {
-       mode_t mode = -1;
+       mode_t mode = (mode_t)(-1);
+       int status = EXIT_SUCCESS;
        int flags = 0;
-       int status = 0;
-       int i, opt;
+       unsigned long opt;
+       char *smode;
 
-       while ((opt = getopt (argc, argv, "m:p")) != -1) {
-               switch (opt) {
-               case 'm':
+       bb_applet_long_options = mkdir_long_options;
+       opt = bb_getopt_ulflags(argc, argv, "m:p", &smode);
+       if(opt & 1) {
                        mode = 0777;
-                       if (!parse_mode (optarg, &mode))
-                               error_msg_and_die ("invalid mode `%s'", optarg);
-                       break;
-               case 'p':
-                       flags |= FILEUTILS_RECUR;
-                       break;
-               default:
-                       show_usage ();
+               if (!bb_parse_mode (smode, &mode)) {
+                       bb_error_msg_and_die ("invalid mode `%s'", smode);
                }
        }
+       if(opt & 2)
+               flags |= FILEUTILS_RECUR;
 
-       if (optind == argc)
-               show_usage ();
+       if (optind == argc) {
+               bb_show_usage();
+       }
 
-       for (i = optind; i < argc; i++)
-               if (make_directory (argv[i], mode, flags) < 0)
-                       status = 1;
+       argv += optind;
+
+       do {
+               if (bb_make_directory(*argv, mode, flags)) {
+                       status = EXIT_FAILURE;
+               }
+       } while (*++argv);
 
        return status;
 }