ash: eval: Add assignment built-in support again

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 22851187c1b2ce26c0b252ec66a132d8a45d80ce..0ee1d1f72fb0f8cfd3b25d6e6568852885e44bbe 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -14,15 +14,10 @@
 /* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
  */
 //config:config MKDIR
-//config:      bool "mkdir (4.4 kb)"
+//config:      bool "mkdir (4.5 kb)"
 //config:      default y
 //config:      help
 //config:      mkdir is used to create directories with the specified names.
-//config:
-//config:config FEATURE_MKDIR_LONG_OPTIONS
-//config:      bool "Enable long options"
-//config:      default y
-//config:      depends on MKDIR && LONG_OPTS
 
 //applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
 
@@ -53,19 +48,6 @@
 
 /* This is a NOFORK applet. Be very careful! */
 
-#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-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
-#if ENABLE_FEATURE_VERBOSE
-       "verbose\0" No_argument       "v"
-#endif
-       ;
-#endif
-
 int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mkdir_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -78,10 +60,17 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
        security_context_t scontext;
 #endif
 
-#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-       applet_long_options = mkdir_longopts;
-#endif
-       opt = getopt32(argv, "m:pv" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
+       opt = getopt32long(argv, "m:pv" IF_SELINUX("Z:"),
+                       "mode\0"    Required_argument "m"
+                       "parents\0" No_argument       "p"
+# if ENABLE_SELINUX
+                       "context\0" Required_argument "Z"
+# endif
+# if ENABLE_FEATURE_VERBOSE
+                       "verbose\0" No_argument       "v"
+# endif
+                       , &smode IF_SELINUX(,&scontext)
+       );
        if (opt & 1) {
                mode_t mmode = bb_parse_mode(smode, 0777);
                if (mmode == (mode_t)-1) {