stty: sort out preprocessor conditionals

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index b42899a4a890180a16eeb901f4f6ec3b2e12a25b..c837e97267c6e8808305f3c6e03d4fdf02ef3f87 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -1,83 +1,78 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mkdir implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <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
+ * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <errno.h>
-#include <sys/param.h>
-
-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";
+/* 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.
+ */
 
-static int parentFlag = FALSE;
-static int permFlag = FALSE;
-static mode_t mode = 0777;
-
+/* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
+ */
 
-extern int mkdir_main(int argc, char **argv)
-{
-    argc--;
-    argv++;
+#include "libbb.h"
 
-    /* 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++;
-    }
+/* 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
 
-    if (argc < 1) {
-       usage( mkdir_usage);
-    }
+int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mkdir_main(int argc UNUSED_PARAM, char **argv)
+{
+       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
 
-    while (--argc > 0) {
-       struct stat statBuf;
-       if (stat(*(++argv), &statBuf) != ENOENT) {
-           fprintf(stderr, "%s: File exists\n", *argv);
-           return( FALSE);
+#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);
+               }
        }
-       if (parentFlag == TRUE)
-           createPath(*argv, mode);
-       else { 
-           if (mkdir (*argv, mode) != 0) {
-               perror(*argv);
-               exit( FALSE);
-           }
+       if (opt & 2)
+               flags |= FILEUTILS_RECUR;
+#if ENABLE_SELINUX
+       if (opt & 4) {
+               selinux_or_die();
+               setfscreatecon_or_die(scontext);
        }
-    }
-    exit( TRUE);
-}
+#endif
+
+       argv += optind;
+       if (!argv[0])
+               bb_show_usage();
 
+       do {
+               if (bb_make_directory(*argv, mode, flags)) {
+                       status = EXIT_FAILURE;
+               }
+       } while (*++argv);
 
+       return status;
+}