bc: convert to "G trick" - this returns bc to zero bss increase

[oweals/busybox.git] / debianutils / run_parts.c

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index c6a90a4865e6e66b520d852c539688824a635123..e4d61df359014c845fabeb8d35fc5f83e533466a 100644 (file)
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -159,10 +159,15 @@ static const char runparts_longopts[] ALIGN1 =
        "reverse\0" No_argument       "\xf0"
        "test\0"    No_argument       "\xf1"
        "exit-on-error\0" No_argument "\xf2"
-#if ENABLE_FEATURE_RUN_PARTS_FANCY
+# if ENABLE_FEATURE_RUN_PARTS_FANCY
        "list\0"    No_argument       "\xf3"
-#endif
+# endif
        ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,runparts_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int run_parts_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -175,12 +180,10 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
 
        INIT_G();
 
-#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
-       applet_long_options = runparts_longopts;
-#endif
        /* We require exactly one argument: the directory name */
-       opt_complementary = "=1";
-       getopt32(argv, "a:*u:", &arg_list, &umask_p);
+       GETOPT32(argv, "^" "a:*u:" "\0" "=1" LONGOPTS,
+                       &arg_list, &umask_p
+       );
 
        umask(xstrtou_range(umask_p, 8, 0, 07777));