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/install.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/install.c')
| -rw-r--r-- | coreutils/install.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/coreutils/install.c b/coreutils/install.c index 8d71fa070..8d5494958 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
| @@ -16,20 +16,19 @@ | |||
| 16 | #include "libcoreutils/coreutils.h" | 16 | #include "libcoreutils/coreutils.h" |
| 17 | 17 | ||
| 18 | #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS | 18 | #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS |
| 19 | static const struct option install_long_options[] = { | 19 | static const char install_longopts[] = |
| 20 | { "directory", 0, NULL, 'd' }, | 20 | "directory\0" No_argument "d" |
| 21 | { "preserve-timestamps", 0, NULL, 'p' }, | 21 | "preserve-timestamps\0" No_argument "p" |
| 22 | { "strip", 0, NULL, 's' }, | 22 | "strip\0" No_argument "s" |
| 23 | { "group", 0, NULL, 'g' }, | 23 | "group\0" No_argument "g" |
| 24 | { "mode", 0, NULL, 'm' }, | 24 | "mode\0" No_argument "m" |
| 25 | { "owner", 0, NULL, 'o' }, | 25 | "owner\0" No_argument "o" |
| 26 | #if ENABLE_SELINUX | 26 | #if ENABLE_SELINUX |
| 27 | { "context", 1, NULL, 'Z' }, | 27 | "context\0" Required_argument "Z" |
| 28 | { "preserve_context", 0, NULL, 0xff }, | 28 | "preserve_context\0" No_argument "\xff" |
| 29 | { "preserve-context", 0, NULL, 0xff }, | 29 | "preserve-context\0" No_argument "\xff" |
| 30 | #endif | 30 | #endif |
| 31 | { 0, 0, 0, 0 } | 31 | "\0"; |
| 32 | }; | ||
| 33 | #endif | 32 | #endif |
| 34 | 33 | ||
| 35 | 34 | ||
| @@ -97,7 +96,7 @@ int install_main(int argc, char **argv) | |||
| 97 | }; | 96 | }; |
| 98 | 97 | ||
| 99 | #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS | 98 | #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS |
| 100 | applet_long_options = install_long_options; | 99 | applet_long_options = install_longopts; |
| 101 | #endif | 100 | #endif |
| 102 | opt_complementary = "s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z"); | 101 | opt_complementary = "s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z"); |
| 103 | /* -c exists for backwards compatibility, it's needed */ | 102 | /* -c exists for backwards compatibility, it's needed */ |