ls: -g implies -l

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index a6eaa9612937a5e651a1eba5508dc0329a517874..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 */
@@ -19,13 +19,12 @@
 /* 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 char mkdir_longopts[] =
+static const char mkdir_longopts[] ALIGN1 =
        "mode\0"    Required_argument "m"
        "parents\0" No_argument       "p"
 #if ENABLE_SELINUX
@@ -34,8 +33,8 @@ static const char mkdir_longopts[] =
        ;
 #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;
@@ -49,7 +48,7 @@ int mkdir_main(int argc, char **argv)
 #if ENABLE_FEATURE_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)) {
@@ -65,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)) {