test: recognize /path/to/[ case too

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 07b18713a9a2e2bb72d213c01c03b3831ea48015..60c03a1f93676e04bf907fb2b344599140b472ca 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -2,101 +2,81 @@
 /*
  * Mini mkdir implementation for busybox
  *
- * Copyright (C) 1999,2000,2001 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
- * 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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/mkdir.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
+ * Fixed broken permission setting when -p was used; especially in
+ * conjunction with -m.
  */
 
-#include "busybox.h"
-#define bb_need_name_too_long
-#define BB_DECLARE_EXTERN
-#include "messages.c"
+/* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
+ */
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
+#include <getopt.h> /* struct option */
+#include "libbb.h"
 
-static int parentFlag = FALSE;
-static mode_t mode = 0777;
+/* This is a NOFORK applet. Be very careful! */
 
+#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
+static const struct option mkdir_long_options[] = {
+       { "mode"   , 1, NULL, 'm' },
+       { "parents", 0, NULL, 'p' },
+#if ENABLE_SELINUX
+       { "context", 1, NULL, 'Z' },
+#endif
+       { NULL, 0, NULL, 0 }
+};
+#endif
 
-extern int mkdir_main(int argc, char **argv)
+int mkdir_main(int argc, char **argv);
+int mkdir_main(int argc, char **argv)
 {
-       int i = FALSE;
+       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
 
-       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) {
-                                       error_msg_and_die("Unknown mode: %s\n", *argv);
-                               }
-                               /* 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);
-                       }
+#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
+       applet_long_options = mkdir_long_options;
+#endif
+       opt = getopt32(argc, argv, "m:p" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext));
+       if (opt & 1) {
+               mode = 0777;
+               if (!bb_parse_mode(smode, &mode)) {
+                       bb_error_msg_and_die("invalid mode '%s'", smode);
                }
-               argc--;
-               argv++;
        }
+       if (opt & 2)
+               flags |= FILEUTILS_RECUR;
+#if ENABLE_SELINUX
+       if (opt & 4) {
+               selinux_or_die();
+               setfscreatecon_or_die(scontext);
+       }
+#endif
 
-       if (argc < 1) {
-               usage(mkdir_usage);
+       if (optind == argc) {
+               bb_show_usage();
        }
 
-       while (argc > 0) {
-               int status;
-               struct stat statBuf;
-               char buf[BUFSIZ + 1];
+       argv += optind;
 
-               if (strlen(*argv) > BUFSIZ - 1) {
-                       error_msg_and_die(name_too_long);
-               }
-               strcpy(buf, *argv);
-               status = stat(buf, &statBuf);
-               if (parentFlag == FALSE && status != -1 && errno != ENOENT) {
-                       error_msg_and_die("%s: File exists\n", buf);
+       do {
+               if (bb_make_directory(*argv, mode, flags)) {
+                       status = EXIT_FAILURE;
                }
-               if (parentFlag == TRUE) {
-                       strcat(buf, "/");
-                       create_path(buf, mode);
-               } else {
-                       if (mkdir(buf, mode) != 0 && parentFlag == FALSE) {
-                               perror_msg_and_die(buf);
-                       }
-               }
-               argc--;
-               argv++;
-       }
-       return EXIT_SUCCESS;
+       } while (*++argv);
+
+       return status;
 }