Remove debugging statement.

[oweals/busybox.git] / mkdir.c

diff --git a/mkdir.c b/mkdir.c
index 98c8d8f089245147113b618aca68aa571870df54..03c49f0983cfa96486cc3d09c5c35c3619a112a1 100644 (file)
--- a/mkdir.c
+++ b/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,65 +20,45 @@
  *
  */
 
-#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 <getopt.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 
-static int parentFlag = FALSE;
-static int permFlag = FALSE;
-static mode_t mode = 0777;
+#include "busybox.h"
 
-
-extern int mkdir_main(int argc, char **argv)
+extern int mkdir_main (int argc, char **argv)
 {
-    argc--;
-    argv++;
+       mode_t mode = -1;
+       int flags = 0;
+       int status = 0;
+       int i, opt;
 
-    /* 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++;
-    }
+       while ((opt = getopt (argc, argv, "m:p")) != -1) {
+               switch (opt) {
+               case 'm':
+                       mode = 0777;
+                       if (!parse_mode (optarg, &mode))
+                               error_msg_and_die ("invalid mode `%s'", optarg);
+                       break;
+               case 'p':
+                       flags |= FILEUTILS_RECUR;
+                       break;
+               default:
+                       show_usage ();
+               }
+       }
 
+       if (optind == argc)
+               show_usage ();
 
-    if (argc < 1) {
-       usage( mkdir_usage);
-    }
+       for (i = optind; i < argc; i++)
+               if (make_directory (argv[i], mode, flags) < 0)
+                       status = 1;
 
-    while (--argc > 0) {
-       struct stat statBuf;
-       if (stat(*(++argv), &statBuf) != ENOENT) {
-           fprintf(stderr, "%s: File exists\n", *argv);
-           return( FALSE);
-       }
-       if (parentFlag == TRUE)
-           createPath(*argv, mode);
-       else { 
-           if (mkdir (*argv, mode) != 0) {
-               perror(*argv);
-               exit( FALSE);
-           }
-       }
-    }
-    exit( TRUE);
+       return status;
 }
-
-