typo fix in a comment in a testcase. oh well...

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 2cc9c7a4c494b043159dc544305ea5ee93e89ddd..a110165db322a33b653b8b645f2dfc9f54e2971a 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -16,19 +16,24 @@
  * 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) MAIN_EXTERNALLY_VISIBLE;
 int mkdir_main(int argc, char **argv)
 {
        mode_t mode = (mode_t)(-1);
@@ -36,11 +41,14 @@ int mkdir_main(int argc, char **argv)
        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);
+       opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
        if (opt & 1) {
                mode = 0777;
                if (!bb_parse_mode(smode, &mode)) {
@@ -49,6 +57,12 @@ int mkdir_main(int argc, char **argv)
        }
        if (opt & 2)
                flags |= FILEUTILS_RECUR;
+#if ENABLE_SELINUX
+       if (opt & 4) {
+               selinux_or_die();
+               setfscreatecon_or_die(scontext);
+       }
+#endif
 
        if (optind == argc) {
                bb_show_usage();