- 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 dc245a18e82715d12d2507ef6cfbf22885ba31e0..48a95badbc760419b3548a6683d55d6b287e481e 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -1,9 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * 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
@@ -21,87 +20,56 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <errno.h>
-#include <sys/param.h>
-
-static const char mkdir_usage[] = "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;
-    argc--;
-    argv++;
+       mode_t mode = (mode_t)(-1);
+       int status = EXIT_SUCCESS;
+       int flags = 0;
+       unsigned long opt;
+       char *smode;
 
-    /* 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);
+       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);
                }
-               /* 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);
-           }
        }
-       argc--;
-       argv++;
-    }
+       if(opt & 2)
+               flags |= FILEUTILS_RECUR;
 
+       if (optind == argc) {
+               bb_show_usage();
+       }
 
-    if (argc < 1) {
-       usage( mkdir_usage);
-    }
+       argv += optind;
 
-    while (argc > 0) {
-       int status;
-       struct stat statBuf;
-       char buf[NAME_MAX];
+       do {
+               if (bb_make_directory(*argv, mode, flags)) {
+                       status = EXIT_FAILURE;
+               }
+       } while (*++argv);
 
-       strcpy (buf, *argv);
-       status=stat(buf, &statBuf);
-       if (parentFlag == FALSE && status != -1 && status != 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);
-           }
-       }
-       argc--;
-       argv++;
-    }
-    exit( TRUE);
+       return status;
 }
-
-