- 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 70fdbdfb5660e62f413125df3e1b80663c7c5247..48a95badbc760419b3548a6683d55d6b287e481e 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -2,9 +2,7 @@
 /*
  * Mini mkdir implementation for busybox
  *
- *
- * Copyright (C) 1999 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,94 +20,56 @@
  *
  */
 
-#include "internal.h"
-#define bb_need_name_too_long
-#define BB_DECLARE_EXTERN
-#include "messages.c"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/param.h>                 /* for PATH_MAX */
-
-static const char mkdir_usage[] =
-       "mkdir [OPTION] DIRECTORY...\n\n"
-       "Create the DIRECTORY(ies), if they do not already exist\n\n"
-       "Options:\n"
-
-       "\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
-       "\t-p\tno error if existing, make parent directories as needed\n";
+/* 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.
+ */
 
-static int parentFlag = FALSE;
-static mode_t mode = 0777;
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h> /* struct option */
+#include "busybox.h"
 
+static const struct option mkdir_long_options[] = {
+       { "mode", 1, NULL, 'm' },
+       { "parents", 0, NULL, 'p' },
+       { 0, 0, 0, 0 }
+};
 
-extern int mkdir_main(int argc, char **argv)
+int mkdir_main (int argc, char **argv)
 {
-       int i = FALSE;
+       mode_t mode = (mode_t)(-1);
+       int status = EXIT_SUCCESS;
+       int flags = 0;
+       unsigned long opt;
+       char *smode;
 
-       argc--;
-       argv++;
-
-       /* Parse any options */
-       while (argc > 0 && **argv == '-') {
-               while (i == FALSE && *++(*argv)) {
-                       switch (**argv) {
-                       case 'm':
-                               if (--argc == 0)
-                                       usage(mkdir_usage);
-                               /* Find the specified modes */
-                               mode = 0;
-                               if (parse_mode(*(++argv), &mode) == FALSE) {
-                                       fprintf(stderr, "Unknown mode: %s\n", *argv);
-                                       exit FALSE;
-                               }
-                               /* Set the umask for this process so it doesn't 
-                                * screw up whatever the user just entered. */
-                               umask(0);
-                               i = TRUE;
-                               break;
-                       case 'p':
-                               parentFlag = TRUE;
-                               break;
-                       default:
-                               usage(mkdir_usage);
-                       }
+       bb_applet_long_options = mkdir_long_options;
+       opt = bb_getopt_ulflags(argc, argv, "m:p", &smode);
+       if(opt & 1) {
+                       mode = 0777;
+               if (!bb_parse_mode (smode, &mode)) {
+                       bb_error_msg_and_die ("invalid mode `%s'", smode);
                }
-               argc--;
-               argv++;
        }
+       if(opt & 2)
+               flags |= FILEUTILS_RECUR;
 
-       if (argc < 1) {
-               usage(mkdir_usage);
+       if (optind == argc) {
+               bb_show_usage();
        }
 
-       while (argc > 0) {
-               int status;
-               struct stat statBuf;
-               char buf[PATH_MAX + 1];
+       argv += optind;
 
-               if (strlen(*argv) > PATH_MAX - 1) {
-                       fprintf(stderr, name_too_long, "mkdir");
-                       exit FALSE;
-               }
-               strcpy(buf, *argv);
-               status = stat(buf, &statBuf);
-               if (parentFlag == FALSE && status != -1 && errno != ENOENT) {
-                       fprintf(stderr, "%s: File exists\n", buf);
-                       exit FALSE;
-               }
-               if (parentFlag == TRUE) {
-                       strcat(buf, "/");
-                       createPath(buf, mode);
-               } else {
-                       if (mkdir(buf, mode) != 0 && parentFlag == FALSE) {
-                               perror(buf);
-                               exit FALSE;
-                       }
+       do {
+               if (bb_make_directory(*argv, mode, flags)) {
+                       status = EXIT_FAILURE;
                }
-               argc--;
-               argv++;
-       }
-       exit TRUE;
+       } while (*++argv);
+
+       return status;
 }