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
author: Denis Vlasenko <vda.linux@googlemail.com> 2007-07-23 17:14:14 +0000
committer: Denis Vlasenko <vda.linux@googlemail.com> 2007-07-23 17:14:14 +0000
commit: bdc88fdc6844ee6890e31ba4cf56800becc8c682 (patch)
tree: 69301e47c6493ad275d72e57ce96467ee13d7ecc /debianutils
parent: 9fe9c1a6d8e66032a9783f98606167764e8ab296 (diff)
download: busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.gz
busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.bz2
busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.zip
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[] = {
+static const char runparts_longopts[] =
-        { "arg",        1,      NULL,   'a' },
+        "arg\0"     Required_argument "a"
-        { "umask",      1,      NULL,   'u' },
+        "umask\0"   Required_argument "u"
-        { "test",       0,      NULL,   't' },
+        "test\0"    No_argument       "t"
 #if ENABLE_FEATURE_RUN_PARTS_FANCY
-        { "list",       0,      NULL,   'l' },
+        "list\0"    No_argument       "l"
-//XXX:TODO:     { "reverse",       0,      NULL,   'r' },
+//TODO: "reverse\0" No_argument       "r"
-//XXX:TODO:     { "verbose",       0,      NULL,   'v' },
+//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[] = {
+static const char start_stop_daemon_longopts[] =
-        { "stop",               0,      NULL,   'K' },
+        "stop\0"         No_argument       "K"
-        { "start",              0,      NULL,   'S' },
+        "start\0"        No_argument       "S"
-        { "background",         0,      NULL,   'b' },
+        "background\0"   No_argument       "b"
-        { "quiet",              0,      NULL,   'q' },
+        "quiet\0"        No_argument       "q"
-        { "make-pidfile",       0,      NULL,   'm' },
+        "make-pidfile\0" No_argument       "m"
 #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
-        { "oknodo",             0,      NULL,   'o' },
+        "oknodo\0"       No_argument       "o"
-        { "verbose",            0,      NULL,   'v' },
+        "verbose\0"      No_argument       "v"
-        { "nicelevel",          1,      NULL,   'N' },
+        "nicelevel\0"    Required_argument "N"
 #endif
-        { "startas",            1,      NULL,   'a' },
+        "startas\0"      Required_argument "a"
-        { "name",               1,      NULL,   'n' },
+        "name\0"         Required_argument "n"
-        { "signal",             1,      NULL,   's' },
+        "signal\0"       Required_argument "s"
-        { "user",               1,      NULL,   'u' },
+        "user\0"         Required_argument "u"
-        { "chuid",              1,      NULL,   'c' },
+        "chuid\0"        Required_argument "c"
-        { "exec",               1,      NULL,   'x' },
+        "exec\0"         Required_argument "x"
-        { "pidfile",            1,      NULL,   'p' },
+        "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 */
author	Denis Vlasenko <vda.linux@googlemail.com>	2007-07-23 17:14:14 +0000
committer	Denis Vlasenko <vda.linux@googlemail.com>	2007-07-23 17:14:14 +0000
commit	bdc88fdc6844ee6890e31ba4cf56800becc8c682 (patch)
tree	69301e47c6493ad275d72e57ce96467ee13d7ecc /debianutils
parent	9fe9c1a6d8e66032a9783f98606167764e8ab296 (diff)
download	busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.gz busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.bz2 busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.zip

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 @@
35	#include "libbb.h"	35	#include "libbb.h"
36		36
37	#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS	37	#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
38	static const struct option runparts_long_options[] = {	38	static const char runparts_longopts[] =
39	{ "arg", 1, NULL, 'a' },	39	"arg\0" Required_argument "a"
40	{ "umask", 1, NULL, 'u' },	40	"umask\0" Required_argument "u"
41	{ "test", 0, NULL, 't' },	41	"test\0" No_argument "t"
42	#if ENABLE_FEATURE_RUN_PARTS_FANCY	42	#if ENABLE_FEATURE_RUN_PARTS_FANCY
43	{ "list", 0, NULL, 'l' },	43	"list\0" No_argument "l"
44	//XXX:TODO: { "reverse", 0, NULL, 'r' },	44	//TODO: "reverse\0" No_argument "r"
45	//XXX:TODO: { "verbose", 0, NULL, 'v' },	45	//TODO: "verbose\0" No_argument "v"
46	#endif	46	#endif
47	{ 0, 0, 0, 0 }	47	"\0";
48	};
49	#endif	48	#endif
50		49
51	struct globals {	50	struct globals {
@@ -120,7 +119,7 @@ int run_parts_main(int argc, char **argv)
120	/* We require exactly one argument: the directory name */	119	/* We require exactly one argument: the directory name */
121	opt_complementary = "=1:a::";	120	opt_complementary = "=1:a::";
122	#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS	121	#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
123	applet_long_options = runparts_long_options;	122	applet_long_options = runparts_longopts;
124	#endif	123	#endif
125	tmp = getopt32(argc, argv, "a:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);	124	tmp = getopt32(argc, argv, "a:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
126	G.mode = tmp &~ (RUN_PARTS_OPT_a\|RUN_PARTS_OPT_u);	125	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)
194	}	194	}
195		195
196	#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS	196	#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
197	static const struct option long_options[] = {	197	static const char start_stop_daemon_longopts[] =
198	{ "stop", 0, NULL, 'K' },	198	"stop\0" No_argument "K"
199	{ "start", 0, NULL, 'S' },	199	"start\0" No_argument "S"
200	{ "background", 0, NULL, 'b' },	200	"background\0" No_argument "b"
201	{ "quiet", 0, NULL, 'q' },	201	"quiet\0" No_argument "q"
202	{ "make-pidfile", 0, NULL, 'm' },	202	"make-pidfile\0" No_argument "m"
203	#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY	203	#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
204	{ "oknodo", 0, NULL, 'o' },	204	"oknodo\0" No_argument "o"
205	{ "verbose", 0, NULL, 'v' },	205	"verbose\0" No_argument "v"
206	{ "nicelevel", 1, NULL, 'N' },	206	"nicelevel\0" Required_argument "N"
207	#endif	207	#endif
208	{ "startas", 1, NULL, 'a' },	208	"startas\0" Required_argument "a"
209	{ "name", 1, NULL, 'n' },	209	"name\0" Required_argument "n"
210	{ "signal", 1, NULL, 's' },	210	"signal\0" Required_argument "s"
211	{ "user", 1, NULL, 'u' },	211	"user\0" Required_argument "u"
212	{ "chuid", 1, NULL, 'c' },	212	"chuid\0" Required_argument "c"
213	{ "exec", 1, NULL, 'x' },	213	"exec\0" Required_argument "x"
214	{ "pidfile", 1, NULL, 'p' },	214	"pidfile\0" Required_argument "p"
215	#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY	215	#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
216	{ "retry", 1, NULL, 'R' },	216	"retry\0" Required_argument "R"
217	#endif	217	#endif
218	{ 0, 0, 0, 0 }	218	"\0";
219	};
220	#endif	219	#endif
221		220
222	enum {	221	enum {
@@ -250,7 +249,7 @@ int start_stop_daemon_main(int argc, char **argv)
250	char *opt_N;	249	char *opt_N;
251	#endif	250	#endif
252	#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS	251	#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
253	applet_long_options = long_options;	252	applet_long_options = start_stop_daemon_longopts;
254	#endif	253	#endif
255		254
256	/* Check required one context option was given */	255	/* Check required one context option was given */