aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-07-23 17:14:14 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-07-23 17:14:14 +0000
commitbdc88fdc6844ee6890e31ba4cf56800becc8c682 (patch)
tree69301e47c6493ad275d72e57ce96467ee13d7ecc /debianutils
parent9fe9c1a6d8e66032a9783f98606167764e8ab296 (diff)
downloadbusybox-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.gz
busybox-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.bz2
rework long option handling. saves ~1.2k
function old new delta tar_longopts - 222 +222 static.udhcpc_longopts - 192 +192 start_stop_daemon_longopts - 150 +150 getopt32 1045 1185 +140 static.wget_longopts - 111 +111 static.od_longopts - 105 +105 getopt_longopts - 96 +96 install_longopts - 67 +67 ipcalc_longopts - 63 +63 static.hwclock_longopts - 54 +54 ftpgetput_longopts - 52 +52 static.dumpleases_longopts - 32 +32 env_longopts - 31 +31 runparts_longopts - 30 +30 mv_longopts - 24 +24 mkdir_longopts - 19 +19 find_pair 164 180 +16 bb_null_long_options - 16 +16 setconsole_longopts - 10 +10 display_speed 91 98 +7 collect_blk 467 474 +7 show_color 4 1 -3 ls_main 913 904 -9 bb_default_long_options 16 - -16 ls_color_opt 32 10 -22 setconsole_long_options 32 - -32 arith 2077 2030 -47 mv_long_options 48 - -48 mkdir_long_options 48 - -48 env_long_options 48 - -48 static.options 248 184 -64 runparts_long_options 80 - -80 ftpgetput_long_options 96 - -96 static.hwclock_long_options 112 - -112 install_long_options 112 - -112 static.long_options 144 - -144 static.wget_long_options 160 - -160 longopts 160 - -160 static.arg_options 304 - -304 tar_long_options 320 - -320 long_options 384 - -384 ------------------------------------------------------------------------------ (add/remove: 17/15 grow/shrink: 4/5 up/down: 1444/-2209) Total: -765 bytes text data bss dec hex filename 782618 1328 11900 795846 c24c6 busybox_old 781354 1328 11900 794582 c1fd6 busybox_unstripped
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/run_parts.c19
-rw-r--r--debianutils/start_stop_daemon.c39
2 files changed, 28 insertions, 30 deletions
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 42170bcb8..4173987ab 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -35,17 +35,16 @@
#include "libbb.h"
#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
-static const struct option runparts_long_options[] = {
- { "arg", 1, NULL, 'a' },
- { "umask", 1, NULL, 'u' },
- { "test", 0, NULL, 't' },
+static const char runparts_longopts[] =
+ "arg\0" Required_argument "a"
+ "umask\0" Required_argument "u"
+ "test\0" No_argument "t"
#if ENABLE_FEATURE_RUN_PARTS_FANCY
- { "list", 0, NULL, 'l' },
-//XXX:TODO: { "reverse", 0, NULL, 'r' },
-//XXX:TODO: { "verbose", 0, NULL, 'v' },
+ "list\0" No_argument "l"
+//TODO: "reverse\0" No_argument "r"
+//TODO: "verbose\0" No_argument "v"
#endif
- { 0, 0, 0, 0 }
-};
+ "\0";
#endif
struct globals {
@@ -120,7 +119,7 @@ int run_parts_main(int argc, char **argv)
/* We require exactly one argument: the directory name */
opt_complementary = "=1:a::";
#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
- applet_long_options = runparts_long_options;
+ applet_long_options = runparts_longopts;
#endif
tmp = getopt32(argc, argv, "a:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
G.mode = tmp &~ (RUN_PARTS_OPT_a|RUN_PARTS_OPT_u);
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index fd9f60ce9..0c8dea760 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -194,29 +194,28 @@ static int do_stop(void)
}
#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
-static const struct option long_options[] = {
- { "stop", 0, NULL, 'K' },
- { "start", 0, NULL, 'S' },
- { "background", 0, NULL, 'b' },
- { "quiet", 0, NULL, 'q' },
- { "make-pidfile", 0, NULL, 'm' },
+static const char start_stop_daemon_longopts[] =
+ "stop\0" No_argument "K"
+ "start\0" No_argument "S"
+ "background\0" No_argument "b"
+ "quiet\0" No_argument "q"
+ "make-pidfile\0" No_argument "m"
#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
- { "oknodo", 0, NULL, 'o' },
- { "verbose", 0, NULL, 'v' },
- { "nicelevel", 1, NULL, 'N' },
+ "oknodo\0" No_argument "o"
+ "verbose\0" No_argument "v"
+ "nicelevel\0" Required_argument "N"
#endif
- { "startas", 1, NULL, 'a' },
- { "name", 1, NULL, 'n' },
- { "signal", 1, NULL, 's' },
- { "user", 1, NULL, 'u' },
- { "chuid", 1, NULL, 'c' },
- { "exec", 1, NULL, 'x' },
- { "pidfile", 1, NULL, 'p' },
+ "startas\0" Required_argument "a"
+ "name\0" Required_argument "n"
+ "signal\0" Required_argument "s"
+ "user\0" Required_argument "u"
+ "chuid\0" Required_argument "c"
+ "exec\0" Required_argument "x"
+ "pidfile\0" Required_argument "p"
#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
- { "retry", 1, NULL, 'R' },
+ "retry\0" Required_argument "R"
#endif
- { 0, 0, 0, 0 }
-};
+ "\0";
#endif
enum {
@@ -250,7 +249,7 @@ int start_stop_daemon_main(int argc, char **argv)
char *opt_N;
#endif
#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
- applet_long_options = long_options;
+ applet_long_options = start_stop_daemon_longopts;
#endif
/* Check required one context option was given */