X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fmkdir.c;h=0de0d5c3b137971308304f0a07fb07515a47a9d3;hb=26d11b8133b3ba71e6e94ff525e45984ddeaef72;hp=690e4ab4094f2184d28e18063ad6e6334945d625;hpb=39c651e9097e0e55a52c897982d6e84d281f7396;p=oweals%2Fbusybox.git

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 690e4ab40..0de0d5c3b 100644
--- 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 */
@@ -19,24 +19,22 @@
 /* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <getopt.h> /* struct option */
-#include "busybox.h"
+#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' },
+static const char mkdir_longopts[] ALIGN1 =
+	"mode\0"    Required_argument "m"
+	"parents\0" No_argument       "p"
 #if ENABLE_SELINUX
-	{ "context", 1, NULL, 'Z' },
+	"context\0" Required_argument "Z"
 #endif
-	{ 0, 0, 0, 0 }
-};
+	;
 #endif
 
-int mkdir_main(int argc, char **argv);
-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;
@@ -48,9 +46,9 @@ int mkdir_main(int argc, char **argv)
 #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" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext));
+	opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
 	if (opt & 1) {
 		mode = 0777;
 		if (!bb_parse_mode(smode, &mode)) {
@@ -66,11 +64,9 @@ int mkdir_main(int argc, char **argv)
 	}
 #endif
 
-	if (optind == argc) {
-		bb_show_usage();
-	}
-
 	argv += optind;
+	if (!argv[0])
+		bb_show_usage();
 
 	do {
 		if (bb_make_directory(*argv, mode, flags)) {