This depmod script will create a modules.dep file, just like the depmod

[oweals/busybox.git] / mkdir.c

diff --git a/mkdir.c b/mkdir.c
index b18c949b844d68c19903852b2e0c438d849eeb3d..03c49f0983cfa96486cc3d09c5c35c3619a112a1 100644 (file)
--- a/mkdir.c
+++ b/mkdir.c
@@ -2,8 +2,7 @@
 /*
  * Mini mkdir implementation for busybox
  *
- * Copyright (C) 1999,2000 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,96 +20,45 @@
  *
  */
 
-#include "internal.h"
-#define bb_need_name_too_long
-#define BB_DECLARE_EXTERN
-#include "messages.c"
-
-#include <stdio.h>
 #include <errno.h>
+#include <getopt.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 
-static const char mkdir_usage[] =
-       "mkdir [OPTION] DIRECTORY...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nCreate 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"
-#endif
-       ;
-
+#include "busybox.h"
 
-static int parentFlag = FALSE;
-static mode_t mode = 0777;
-
-
-extern int mkdir_main(int argc, char **argv)
+extern int mkdir_main (int argc, char **argv)
 {
-       int i = FALSE;
-
-       argc--;
-       argv++;
+       mode_t mode = -1;
+       int flags = 0;
+       int status = 0;
+       int i, opt;
 
-       /* 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);
-                       }
+       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 ();
                }
-               argc--;
-               argv++;
        }
 
-       if (argc < 1) {
-               usage(mkdir_usage);
-       }
+       if (optind == argc)
+               show_usage ();
 
-       while (argc > 0) {
-               int status;
-               struct stat statBuf;
-               char buf[BUFSIZ + 1];
+       for (i = optind; i < argc; i++)
+               if (make_directory (argv[i], mode, flags) < 0)
+                       status = 1;
 
-               if (strlen(*argv) > BUFSIZ - 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++;
-       }
-       return( TRUE);
+       return status;
 }