diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2014-05-19 16:23:50 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-05-19 16:23:50 +0200 |
| commit | 17f8418ea75410c3fbf9c9558f50f22cb8808e3e (patch) | |
| tree | 9b9a7d6296ffb77c8b855eb34b8cbf03b960e005 /coreutils/mv.c | |
| parent | 539e2802ebd2680602de0a2c76069b7f555392d9 (diff) | |
| download | busybox-w32-17f8418ea75410c3fbf9c9558f50f22cb8808e3e.tar.gz busybox-w32-17f8418ea75410c3fbf9c9558f50f22cb8808e3e.tar.bz2 busybox-w32-17f8418ea75410c3fbf9c9558f50f22cb8808e3e.zip | |
Add conditional support for -v / --verbose
With FEATURE_VERBOSE off, practically no size change.
With it on:
function old new delta
remove_file 493 556 +63
install_main 719 765 +46
bb_make_directory 383 419 +36
rmdir_main 162 191 +29
copy_file 1516 1544 +28
mv_main 502 525 +23
cmp_main 677 693 +16
bbconfig_config_bz2 5264 5279 +15
mkdir_main 158 168 +10
install_longopts 66 76 +10
rm_main 167 175 +8
nexpr 840 846 +6
scan_tree 275 280 +5
fsck_main 1807 1811 +4
ed_main 2541 2545 +4
expand_one_var 1574 1575 +1
swap_on_off_main 420 418 -2
parse_command 1443 1440 -3
redirect 1279 1274 -5
do_load 946 918 -28
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 16/4 up/down: 304/-38) Total: 266 bytes
Based on the patch by Igor Živković.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/mv.c')
| -rw-r--r-- | coreutils/mv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/coreutils/mv.c b/coreutils/mv.c index f127dfabd..50571755b 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c | |||
| @@ -33,13 +33,17 @@ static const char mv_longopts[] ALIGN1 = | |||
| 33 | "interactive\0" No_argument "i" | 33 | "interactive\0" No_argument "i" |
| 34 | "force\0" No_argument "f" | 34 | "force\0" No_argument "f" |
| 35 | "no-clobber\0" No_argument "n" | 35 | "no-clobber\0" No_argument "n" |
| 36 | IF_FEATURE_VERBOSE( | ||
| 36 | "verbose\0" No_argument "v" | 37 | "verbose\0" No_argument "v" |
| 38 | ) | ||
| 37 | ; | 39 | ; |
| 38 | #endif | 40 | #endif |
| 39 | 41 | ||
| 40 | #define OPT_FORCE (1 << 0) | 42 | #define OPT_FORCE (1 << 0) |
| 41 | #define OPT_INTERACTIVE (1 << 1) | 43 | #define OPT_INTERACTIVE (1 << 1) |
| 42 | #define OPT_NOCLOBBER (1 << 2) | 44 | #define OPT_NOCLOBBER (1 << 2) |
| 45 | #define OPT_VERBOSE ((1 << 3) * ENABLE_FEATURE_VERBOSE) | ||
| 46 | |||
| 43 | 47 | ||
| 44 | int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 48 | int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 45 | int mv_main(int argc, char **argv) | 49 | int mv_main(int argc, char **argv) |
| @@ -58,7 +62,6 @@ int mv_main(int argc, char **argv) | |||
| 58 | /* Need at least two arguments. | 62 | /* Need at least two arguments. |
| 59 | * If more than one of -f, -i, -n is specified , only the final one | 63 | * If more than one of -f, -i, -n is specified , only the final one |
| 60 | * takes effect (it unsets previous options). | 64 | * takes effect (it unsets previous options). |
| 61 | * -v is accepted but ignored. | ||
| 62 | */ | 65 | */ |
| 63 | opt_complementary = "-2:f-in:i-fn:n-fi"; | 66 | opt_complementary = "-2:f-in:i-fn:n-fi"; |
| 64 | flags = getopt32(argv, "finv"); | 67 | flags = getopt32(argv, "finv"); |
| @@ -148,6 +151,9 @@ int mv_main(int argc, char **argv) | |||
| 148 | status = 1; | 151 | status = 1; |
| 149 | } | 152 | } |
| 150 | RET_0: | 153 | RET_0: |
| 154 | if (flags & OPT_VERBOSE) { | ||
| 155 | printf("'%s' -> '%s'\n", *argv, dest); | ||
| 156 | } | ||
| 151 | if (dest != last) { | 157 | if (dest != last) { |
| 152 | free((void *) dest); | 158 | free((void *) dest); |
| 153 | } | 159 | } |