My latest ramblings.

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 98c8d8f089245147113b618aca68aa571870df54..70fdbdfb5660e62f413125df3e1b80663c7c5247 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mkdir implementation for busybox
  *
@@ -22,64 +23,93 @@
  */
 
 #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>
+#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"
 
-static const char mkdir_usage[] = "Usage: mkdir [OPTION] DIRECTORY...\n"
-"Create the DIRECTORY(ies), if they do not already exist\n\n"
-"-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
-"-p\tno error if existing, make parent directories as needed\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";
 
 
 static int parentFlag = FALSE;
-static int permFlag = FALSE;
 static mode_t mode = 0777;
 
 
 extern int mkdir_main(int argc, char **argv)
 {
-    argc--;
-    argv++;
+       int i = FALSE;
 
-    /* Parse any options */
-    while (argc > 1 && **argv == '-') {
-       while (*++(*argv))
-           switch (**argv) {
-           case 'm':
-               permFlag = TRUE;
-               break;
-           case 'p':
-               parentFlag = TRUE;
-               break;
-           default:
-               usage( mkdir_usage);
-           }
        argc--;
        argv++;
-    }
-
-
-    if (argc < 1) {
-       usage( mkdir_usage);
-    }
 
-    while (--argc > 0) {
-       struct stat statBuf;
-       if (stat(*(++argv), &statBuf) != ENOENT) {
-           fprintf(stderr, "%s: File exists\n", *argv);
-           return( FALSE);
+       /* 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);
+                       }
+               }
+               argc--;
+               argv++;
        }
-       if (parentFlag == TRUE)
-           createPath(*argv, mode);
-       else { 
-           if (mkdir (*argv, mode) != 0) {
-               perror(*argv);
-               exit( FALSE);
-           }
+
+       if (argc < 1) {
+               usage(mkdir_usage);
        }
-    }
-    exit( TRUE);
-}
 
+       while (argc > 0) {
+               int status;
+               struct stat statBuf;
+               char buf[PATH_MAX + 1];
 
+               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;
+                       }
+               }
+               argc--;
+               argv++;
+       }
+       exit TRUE;
+}