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 /coreutils/od_bloaty.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 'coreutils/od_bloaty.c')
| -rw-r--r-- | coreutils/od_bloaty.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index af5eba9ce..335efe7ca 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c | |||
| @@ -1242,17 +1242,16 @@ int od_main(int argc, char **argv) | |||
| 1242 | OPT_traditional = (1 << 18) * ENABLE_GETOPT_LONG, | 1242 | OPT_traditional = (1 << 18) * ENABLE_GETOPT_LONG, |
| 1243 | }; | 1243 | }; |
| 1244 | #if ENABLE_GETOPT_LONG | 1244 | #if ENABLE_GETOPT_LONG |
| 1245 | static const struct option long_options[] = { | 1245 | static const char od_longopts[] = |
| 1246 | { "skip-bytes", required_argument, NULL, 'j' }, | 1246 | "skip-bytes\0" Required_argument "j" |
| 1247 | { "address-radix", required_argument, NULL, 'A' }, | 1247 | "address-radix\0" Required_argument "A" |
| 1248 | { "read-bytes", required_argument, NULL, 'N' }, | 1248 | "read-bytes\0" Required_argument "N" |
| 1249 | { "format", required_argument, NULL, 't' }, | 1249 | "format\0" Required_argument "t" |
| 1250 | { "output-duplicates", no_argument, NULL, 'v' }, | 1250 | "output-duplicates\0" No_argument "v" |
| 1251 | { "strings", optional_argument, NULL, 'S' }, | 1251 | "strings\0" Optional_argument "S" |
| 1252 | { "width", optional_argument, NULL, 'w' }, | 1252 | "width\0" Optional_argument "w" |
| 1253 | { "traditional", no_argument, NULL, 0xff }, | 1253 | "traditional\0" No_argument "\xff" |
| 1254 | { NULL, 0, NULL, 0 } | 1254 | "\0"; |
| 1255 | }; | ||
| 1256 | #endif | 1255 | #endif |
| 1257 | char *str_A, *str_N, *str_j, *str_S; | 1256 | char *str_A, *str_N, *str_j, *str_S; |
| 1258 | char *str_w = NULL; | 1257 | char *str_w = NULL; |
| @@ -1267,7 +1266,7 @@ int od_main(int argc, char **argv) | |||
| 1267 | /* Parse command line */ | 1266 | /* Parse command line */ |
| 1268 | opt_complementary = "t::"; // list | 1267 | opt_complementary = "t::"; // list |
| 1269 | #if ENABLE_GETOPT_LONG | 1268 | #if ENABLE_GETOPT_LONG |
| 1270 | applet_long_options = long_options; | 1269 | applet_long_options = od_longopts; |
| 1271 | #endif | 1270 | #endif |
| 1272 | opt = getopt32(argc, argv, "A:N:abcdfhij:lot:vxsS:" | 1271 | opt = getopt32(argc, argv, "A:N:abcdfhij:lot:vxsS:" |
| 1273 | "w::", // -w with optional param | 1272 | "w::", // -w with optional param |