Latest and greatest

[oweals/busybox.git] / mkdir.c

diff --git a/mkdir.c b/mkdir.c
index 8f1fa04db50d705f93a888e6db2deb99a6314a80..28315cad6e41b2d9073ded9dd30c29d3158b7596 100644 (file)
--- a/mkdir.c
+++ b/mkdir.c
@@ -1,58 +1,102 @@
+/*
+ * Mini mkdir implementation for busybox
+ *
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
 #include "internal.h"
+#include <stdio.h>
 #include <errno.h>
 #include <sys/param.h>
 
-const char mkdir_usage[] = "mkdir [-m mode] directory [directory ...]\n"
-"\tCreate directories.\n"
-"\n"
-"\t-m mode:\tSpecifiy the mode for the new directory\n"
-"\t\tunder the argument directory.";
+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";
 
-/*make directories skipping the last part of the path. Used here and by untar*/
-int mkdir_until(const char *fpath, const struct FileInfo * fi)
-{
-       char    path[PATH_MAX];
-       char *  s = path;
 
-       strcpy(path, fpath);
-       if ( s[0] == '\0' && s[1] == '\0' ) {
-               usage(mkdir_usage);
-               return 1;
-       }
-       s++;
-       while ( *s != '\0' ) {
-               if ( *s == '/' ) {
-                       int     status;
-
-                       *s = '\0';
-                       status = mkdir(path, (fi?fi->orWithMode:0700) );
-                       *s = '/';
-
-                       if ( status != 0 ) {
-                               if ( errno != EEXIST ) {
-                                       name_and_error(fpath);
-                                       return 1;
-                               }
-                       }
+static int parentFlag = FALSE;
+static mode_t mode = 0777;
 
-               }
-               s++;
-       }
-       return 0;
-}
 
-int
-mkdir_fn(const struct FileInfo * i)
+extern int mkdir_main(int argc, char **argv)
 {
-       if ( i->makeParentDirectories ) {
-               if(mkdir_until(i->source, i)) return 1;
+    int i=FALSE;
+    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);
+           }
        }
+       argc--;
+       argv++;
+    }
+
 
-       if ( mkdir(i->source, i->orWithMode) != 0 && errno != EEXIST ) {
-               name_and_error(i->source);
-               return 1;
+    if (argc < 1) {
+       usage( mkdir_usage);
+    }
+
+    while (argc > 0) {
+       int status;
+       struct stat statBuf;
+       status=stat(*argv, &statBuf);
+       if (status != -1 && status != ENOENT ) {
+           fprintf(stderr, "%s: File exists\n", *argv);
+           exit( FALSE);
+       }
+       if (parentFlag == TRUE)
+           createPath(*argv, mode);
+       else { 
+           if (mkdir (*argv, mode) != 0) {
+               perror(*argv);
+               exit( FALSE);
+           }
        }
-       else
-               return 0;
+       argc--;
+       argv++;
+    }
+    exit( TRUE);
 }
 
+