ls: -g implies -l

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 1aee8b2b5c4639d2c0af4135202ef1bbe075cba0..0de0d5c3b137971308304f0a07fb07515a47a9d3 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -16,45 +16,57 @@
  * conjunction with -m.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <getopt.h> /* struct option */
-#include "busybox.h"
+/* 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 struct option mkdir_long_options[] = {
-       { "mode", 1, NULL, 'm' },
-       { "parents", 0, NULL, 'p' },
-       { 0, 0, 0, 0 }
-};
+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_main (int argc, char **argv)
+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
 
 #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-       applet_long_options = mkdir_long_options;
+       applet_long_options = mkdir_longopts;
 #endif
-       opt = getopt32(argc, argv, "m:p", &smode);
-       if(opt & 1) {
+       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 (!bb_parse_mode(smode, &mode)) {
+                       bb_error_msg_and_die("invalid mode '%s'", smode);
                }
        }
-       if(opt & 2)
+       if (opt & 2)
                flags |= FILEUTILS_RECUR;
-
-       if (optind == argc) {
-               bb_show_usage();
+#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)) {