Applied patch from Christophe Boyanique to add an egrep alias for grep.

[oweals/busybox.git] / mkdir.c

diff --git a/mkdir.c b/mkdir.c
index 98c8d8f089245147113b618aca68aa571870df54..902da7c9982e852d44643718da01fa7f8d76b112 100644 (file)
--- a/mkdir.c
+++ b/mkdir.c
@@ -1,8 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mkdir implementation for busybox
  *
- *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,65 +21,82 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <errno.h>
-#include <sys/param.h>
-
-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";
+#include <string.h>
+#include <stdlib.h>
+#include "busybox.h"
+#define bb_need_name_too_long
+#define BB_DECLARE_EXTERN
+#include "messages.c"
 
 
 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)
+                                       show_usage();
+                               /* Find the specified modes */
+                               mode = 0;
+                               if (parse_mode(*(++argv), &mode) == FALSE) {
+                                       error_msg_and_die("Unknown mode: %s", *argv);
+                               }
+                               /* 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:
+                               show_usage();
+                       }
+               }
+               argc--;
+               argv++;
        }
-       if (parentFlag == TRUE)
-           createPath(*argv, mode);
-       else { 
-           if (mkdir (*argv, mode) != 0) {
-               perror(*argv);
-               exit( FALSE);
-           }
+
+       if (argc < 1) {
+               show_usage();
        }
-    }
-    exit( TRUE);
-}
 
+       while (argc > 0) {
+               int status;
+               struct stat statBuf;
+               char buf[BUFSIZ + 1];
 
+               if (strlen(*argv) > BUFSIZ - 1) {
+                       error_msg_and_die(name_too_long);
+               }
+               strcpy(buf, *argv);
+               status = stat(buf, &statBuf);
+               if (parentFlag == FALSE && status != -1 && errno != ENOENT) {
+                       error_msg_and_die("%s: File exists", buf);
+               }
+               if (parentFlag == TRUE) {
+                       strcat(buf, "/");
+                       create_path(buf, mode);
+               } else {
+                       if (mkdir(buf, mode) != 0 && parentFlag == FALSE) {
+                               perror_msg_and_die(buf);
+                       }
+               }
+               argc--;
+               argv++;
+       }
+       return EXIT_SUCCESS;
+}