diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-23 21:14:14 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-23 21:14:14 +0400 |
commit | bdc88fdc6844ee6890e31ba4cf56800becc8c682 (patch) | |
tree | 69301e47c6493ad275d72e57ce96467ee13d7ecc /networking/udhcp | |
parent | 9fe9c1a6d8e66032a9783f98606167764e8ab296 (diff) |
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 'networking/udhcp')
-rw-r--r-- | networking/udhcp/dhcpc.c | 43 | ||||
-rw-r--r-- | networking/udhcp/dumpleases.c | 13 |
2 files changed, 27 insertions, 29 deletions
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 3165c2d68..2b95c3250 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -181,27 +181,26 @@ int udhcpc_main(int argc, char **argv) OPT_v = 1 << 17, }; #if ENABLE_GETOPT_LONG - static const struct option arg_options[] = { - { "clientid", required_argument, 0, 'c' }, - { "clientid-none", no_argument, 0, 'C' }, - { "vendorclass", required_argument, 0, 'V' }, - { "foreground", no_argument, 0, 'f' }, - { "background", no_argument, 0, 'b' }, - { "hostname", required_argument, 0, 'H' }, - { "hostname", required_argument, 0, 'h' }, - { "fqdn", required_argument, 0, 'F' }, - { "interface", required_argument, 0, 'i' }, - { "now", no_argument, 0, 'n' }, - { "pidfile", required_argument, 0, 'p' }, - { "quit", no_argument, 0, 'q' }, - { "release", no_argument, 0, 'R' }, - { "request", required_argument, 0, 'r' }, - { "script", required_argument, 0, 's' }, - { "timeout", required_argument, 0, 'T' }, - { "version", no_argument, 0, 'v' }, - { "retries", required_argument, 0, 't' }, - { 0, 0, 0, 0 } - }; + static const char udhcpc_longopts[] = + "clientid\0" Required_argument "c" + "clientid-none\0" No_argument "C" + "vendorclass\0" Required_argument "V" + "foreground\0" No_argument "f" + "background\0" No_argument "b" + "hostname\0" Required_argument "H" + "hostname\0" Required_argument "h" + "fqdn\0" Required_argument "F" + "interface\0" Required_argument "i" + "now\0" No_argument "n" + "pidfile\0" Required_argument "p" + "quit\0" No_argument "q" + "release\0" No_argument "R" + "request\0" Required_argument "r" + "script\0" Required_argument "s" + "timeout\0" Required_argument "T" + "version\0" No_argument "v" + "retries\0" Required_argument "t" + "\0"; #endif /* Default options. */ client_config.interface = "eth0"; @@ -213,7 +212,7 @@ int udhcpc_main(int argc, char **argv) opt_complementary = "c--C:C--c" // mutually exclusive ":hH:Hh"; // -h and -H are the same #if ENABLE_GETOPT_LONG - applet_long_options = arg_options; + applet_long_options = udhcpc_longopts; #endif opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v", &str_c, &str_V, &str_h, &str_h, &str_F, diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index 95df7ea36..fb50d6888 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c @@ -24,14 +24,13 @@ int dumpleases_main(int argc, char **argv) OPT_f = 0x4, // -f }; #if ENABLE_GETOPT_LONG - static const struct option options[] = { - { "absolute", no_argument, 0, 'a' }, - { "remaining", no_argument, 0, 'r' }, - { "file", required_argument, 0, 'f' }, - { NULL, 0, 0, 0 } - }; + static const char dumpleases_longopts[] = + "absolute\0" No_argument "a" + "remaining\0" No_argument "r" + "file\0" Required_argument "f" + "\0"; - applet_long_options = options; + applet_long_options = dumpleases_longopts; #endif opt_complementary = "=0:a--r:r--a"; opt = getopt32(argc, argv, "arf:", &file); |