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 /libbb | |
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 'libbb')
-rw-r--r-- | libbb/copy_file.c | 4 | ||||
-rw-r--r-- | libbb/make_directory.c | 4 | ||||
-rw-r--r-- | libbb/remove_file.c | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c index 9333a8d49..a4be875d2 100644 --- a/libbb/copy_file.c +++ b/libbb/copy_file.c | |||
@@ -389,5 +389,9 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags) | |||
389 | bb_perror_msg("can't preserve %s of '%s'", "permissions", dest); | 389 | bb_perror_msg("can't preserve %s of '%s'", "permissions", dest); |
390 | } | 390 | } |
391 | 391 | ||
392 | if (flags & FILEUTILS_VERBOSE) { | ||
393 | printf("'%s' -> '%s'\n", source, dest); | ||
394 | } | ||
395 | |||
392 | return retval; | 396 | return retval; |
393 | } | 397 | } |
diff --git a/libbb/make_directory.c b/libbb/make_directory.c index 7826b90f5..89352ca1f 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c | |||
@@ -99,6 +99,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) | |||
99 | if (!c) { | 99 | if (!c) { |
100 | goto ret0; | 100 | goto ret0; |
101 | } | 101 | } |
102 | } else { | ||
103 | if (flags & FILEUTILS_VERBOSE) { | ||
104 | printf("created directory: '%s'\n", path); | ||
105 | } | ||
102 | } | 106 | } |
103 | 107 | ||
104 | if (!c) { | 108 | if (!c) { |
diff --git a/libbb/remove_file.c b/libbb/remove_file.c index 5b75f7f30..eaca293d9 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c | |||
@@ -78,6 +78,10 @@ int FAST_FUNC remove_file(const char *path, int flags) | |||
78 | return -1; | 78 | return -1; |
79 | } | 79 | } |
80 | 80 | ||
81 | if (flags & FILEUTILS_VERBOSE) { | ||
82 | printf("removed directory: '%s'\n", path); | ||
83 | } | ||
84 | |||
81 | return status; | 85 | return status; |
82 | } | 86 | } |
83 | 87 | ||
@@ -98,5 +102,9 @@ int FAST_FUNC remove_file(const char *path, int flags) | |||
98 | return -1; | 102 | return -1; |
99 | } | 103 | } |
100 | 104 | ||
105 | if (flags & FILEUTILS_VERBOSE) { | ||
106 | printf("removed '%s'\n", path); | ||
107 | } | ||
108 | |||
101 | return 0; | 109 | return 0; |
102 | } | 110 | } |