More stuff

[oweals/busybox.git] / mkdir.c

diff --git a/mkdir.c b/mkdir.c
index 61d35d5cda1249235b1e918c87d3a4f675bc52c4..0d0a90ec3d714dc0d4664f2bd776778a2c1175cb 100644 (file)
--- a/mkdir.c
+++ b/mkdir.c
@@ -1,7 +1,9 @@
 /*
  * Mini mkdir implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999 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
  * it under the terms of the GNU General Public License as published by
@@ -24,51 +26,63 @@
 #include <errno.h>
 #include <sys/param.h>
 
-const char mkdir_usage[] = "Usage: mkdir [OPTION] DIRECTORY...\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";
 
 
 static int parentFlag = FALSE;
-static int permFlag = FALSE;
-static mode_t mode = 0777;
+static mode_t mode = 777;
 
 
 extern int mkdir_main(int argc, char **argv)
 {
+    int i=FALSE;
     argc--;
     argv++;
 
     /* Parse any options */
-    while (argc > 1 && **argv == '-') {
-       while (*++(*argv))
+    while (argc > 0 && **argv == '-') {
+       while (i==FALSE && *++(*argv)) {
            switch (**argv) {
            case 'm':
-               permFlag = TRUE;
+               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:
-               fprintf(stderr, "%s\n", mkdir_usage);
-               exit(FALSE);
+               usage( mkdir_usage);
            }
+       }
        argc--;
        argv++;
     }
 
 
     if (argc < 1) {
-       fprintf(stderr, "%s\n", mkdir_usage);
-       exit (FALSE);
+       usage( mkdir_usage);
     }
 
-    while (--argc > 0) {
+    while (argc > 0) {
+       int status;
        struct stat statBuf;
-       if (stat(*(++argv), &statBuf) != ENOENT) {
+       status=stat(*argv, &statBuf);
+       if (status != -1 && status != ENOENT ) {
            fprintf(stderr, "%s: File exists\n", *argv);
-           return( FALSE);
+           exit( FALSE);
        }
        if (parentFlag == TRUE)
            createPath(*argv, mode);
@@ -78,6 +92,8 @@ extern int mkdir_main(int argc, char **argv)
                exit( FALSE);
            }
        }
+       argc--;
+       argv++;
     }
     exit( TRUE);
 }