stty: sort out preprocessor conditionals

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 60c03a1f93676e04bf907fb2b344599140b472ca..c837e97267c6e8808305f3c6e03d4fdf02ef3f87 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -19,24 +19,22 @@
 /* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
  */
 
-#include <getopt.h> /* struct option */
 #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
-       { NULL, 0, NULL, 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)) {