diff options
| 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 /networking/udhcp/dhcpc.c | |
| parent | 9fe9c1a6d8e66032a9783f98606167764e8ab296 (diff) | |
| download | busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.gz busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.tar.bz2 busybox-w32-bdc88fdc6844ee6890e31ba4cf56800becc8c682.zip | |
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/dhcpc.c')
| -rw-r--r-- | networking/udhcp/dhcpc.c | 43 |
1 files changed, 21 insertions, 22 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) | |||
| 181 | OPT_v = 1 << 17, | 181 | OPT_v = 1 << 17, |
| 182 | }; | 182 | }; |
| 183 | #if ENABLE_GETOPT_LONG | 183 | #if ENABLE_GETOPT_LONG |
| 184 | static const struct option arg_options[] = { | 184 | static const char udhcpc_longopts[] = |
| 185 | { "clientid", required_argument, 0, 'c' }, | 185 | "clientid\0" Required_argument "c" |
| 186 | { "clientid-none", no_argument, 0, 'C' }, | 186 | "clientid-none\0" No_argument "C" |
| 187 | { "vendorclass", required_argument, 0, 'V' }, | 187 | "vendorclass\0" Required_argument "V" |
| 188 | { "foreground", no_argument, 0, 'f' }, | 188 | "foreground\0" No_argument "f" |
| 189 | { "background", no_argument, 0, 'b' }, | 189 | "background\0" No_argument "b" |
| 190 | { "hostname", required_argument, 0, 'H' }, | 190 | "hostname\0" Required_argument "H" |
| 191 | { "hostname", required_argument, 0, 'h' }, | 191 | "hostname\0" Required_argument "h" |
| 192 | { "fqdn", required_argument, 0, 'F' }, | 192 | "fqdn\0" Required_argument "F" |
| 193 | { "interface", required_argument, 0, 'i' }, | 193 | "interface\0" Required_argument "i" |
| 194 | { "now", no_argument, 0, 'n' }, | 194 | "now\0" No_argument "n" |
| 195 | { "pidfile", required_argument, 0, 'p' }, | 195 | "pidfile\0" Required_argument "p" |
| 196 | { "quit", no_argument, 0, 'q' }, | 196 | "quit\0" No_argument "q" |
| 197 | { "release", no_argument, 0, 'R' }, | 197 | "release\0" No_argument "R" |
| 198 | { "request", required_argument, 0, 'r' }, | 198 | "request\0" Required_argument "r" |
| 199 | { "script", required_argument, 0, 's' }, | 199 | "script\0" Required_argument "s" |
| 200 | { "timeout", required_argument, 0, 'T' }, | 200 | "timeout\0" Required_argument "T" |
| 201 | { "version", no_argument, 0, 'v' }, | 201 | "version\0" No_argument "v" |
| 202 | { "retries", required_argument, 0, 't' }, | 202 | "retries\0" Required_argument "t" |
| 203 | { 0, 0, 0, 0 } | 203 | "\0"; |
| 204 | }; | ||
| 205 | #endif | 204 | #endif |
| 206 | /* Default options. */ | 205 | /* Default options. */ |
| 207 | client_config.interface = "eth0"; | 206 | client_config.interface = "eth0"; |
| @@ -213,7 +212,7 @@ int udhcpc_main(int argc, char **argv) | |||
| 213 | opt_complementary = "c--C:C--c" // mutually exclusive | 212 | opt_complementary = "c--C:C--c" // mutually exclusive |
| 214 | ":hH:Hh"; // -h and -H are the same | 213 | ":hH:Hh"; // -h and -H are the same |
| 215 | #if ENABLE_GETOPT_LONG | 214 | #if ENABLE_GETOPT_LONG |
| 216 | applet_long_options = arg_options; | 215 | applet_long_options = udhcpc_longopts; |
| 217 | #endif | 216 | #endif |
| 218 | opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v", | 217 | opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v", |
| 219 | &str_c, &str_V, &str_h, &str_h, &str_F, | 218 | &str_c, &str_V, &str_h, &str_h, &str_F, |