lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / coreutils / mkdir.c

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 8f1fa04db50d705f93a888e6db2deb99a6314a80..0de0d5c3b137971308304f0a07fb07515a47a9d3 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -1,58 +1,78 @@
-#include "internal.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.";
-
-/*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;
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini mkdir implementation for busybox
+ *
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
 
-       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;
-                               }
-                       }
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/mkdir.html */
 
-               }
-               s++;
-       }
-       return 0;
-}
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Fixed broken permission setting when -p was used; especially in
+ * conjunction with -m.
+ */
+
+/* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
+ */
+
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
+static const char mkdir_longopts[] ALIGN1 =
+       "mode\0"    Required_argument "m"
+       "parents\0" No_argument       "p"
+#if ENABLE_SELINUX
+       "context\0" Required_argument "Z"
+#endif
+       ;
+#endif
 
-int
-mkdir_fn(const struct FileInfo * i)
+int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mkdir_main(int argc UNUSED_PARAM, char **argv)
 {
-       if ( i->makeParentDirectories ) {
-               if(mkdir_until(i->source, i)) return 1;
-       }
+       mode_t mode = (mode_t)(-1);
+       int status = EXIT_SUCCESS;
+       int flags = 0;
+       unsigned opt;
+       char *smode;
+#if ENABLE_SELINUX
+       security_context_t scontext;
+#endif
 
-       if ( mkdir(i->source, i->orWithMode) != 0 && errno != EEXIST ) {
-               name_and_error(i->source);
-               return 1;
+#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
+       applet_long_options = mkdir_longopts;
+#endif
+       opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
+       if (opt & 1) {
+               mode = 0777;
+               if (!bb_parse_mode(smode, &mode)) {
+                       bb_error_msg_and_die("invalid mode '%s'", smode);
+               }
        }
-       else
-               return 0;
-}
+       if (opt & 2)
+               flags |= FILEUTILS_RECUR;
+#if ENABLE_SELINUX
+       if (opt & 4) {
+               selinux_or_die();
+               setfscreatecon_or_die(scontext);
+       }
+#endif
 
+       argv += optind;
+       if (!argv[0])
+               bb_show_usage();
+
+       do {
+               if (bb_make_directory(*argv, mode, flags)) {
+                       status = EXIT_FAILURE;
+               }
+       } while (*++argv);
+
+       return status;
+}