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/ftpgetput.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/ftpgetput.c')
| -rw-r--r-- | networking/ftpgetput.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index 54b5f5a91..011fbac84 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c | |||
| @@ -287,14 +287,13 @@ int ftp_send(ftp_host_info_t *server, FILE *control_stream, | |||
| 287 | #define FTPGETPUT_OPT_PORT 16 | 287 | #define FTPGETPUT_OPT_PORT 16 |
| 288 | 288 | ||
| 289 | #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS | 289 | #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS |
| 290 | static const struct option ftpgetput_long_options[] = { | 290 | static const char ftpgetput_longopts[] = |
| 291 | { "continue", 1, NULL, 'c' }, | 291 | "continue\0" Required_argument "c" |
| 292 | { "verbose", 0, NULL, 'v' }, | 292 | "verbose\0" No_argument "v" |
| 293 | { "username", 1, NULL, 'u' }, | 293 | "username\0" Required_argument "u" |
| 294 | { "password", 1, NULL, 'p' }, | 294 | "password\0" Required_argument "p" |
| 295 | { "port", 1, NULL, 'P' }, | 295 | "port\0" Required_argument "P" |
| 296 | { 0, 0, 0, 0 } | 296 | "\0"; |
| 297 | }; | ||
| 298 | #endif | 297 | #endif |
| 299 | 298 | ||
| 300 | int ftpgetput_main(int argc, char **argv); | 299 | int ftpgetput_main(int argc, char **argv); |
| @@ -329,7 +328,7 @@ int ftpgetput_main(int argc, char **argv) | |||
| 329 | * Decipher the command line | 328 | * Decipher the command line |
| 330 | */ | 329 | */ |
| 331 | #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS | 330 | #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS |
| 332 | applet_long_options = ftpgetput_long_options; | 331 | applet_long_options = ftpgetput_longopts; |
| 333 | #endif | 332 | #endif |
| 334 | opt_complementary = "=3"; /* must have 3 params */ | 333 | opt_complementary = "=3"; /* must have 3 params */ |
| 335 | opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port); | 334 | opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port); |