summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2014-05-19 16:23:50 +0200
committerDenys Vlasenko2014-05-19 16:23:50 +0200
commit17f8418ea75410c3fbf9c9558f50f22cb8808e3e (patch)
tree9b9a7d6296ffb77c8b855eb34b8cbf03b960e005 /libbb
parent539e2802ebd2680602de0a2c76069b7f555392d9 (diff)
downloadbusybox-17f8418ea75410c3fbf9c9558f50f22cb8808e3e.zip
busybox-17f8418ea75410c3fbf9c9558f50f22cb8808e3e.tar.gz
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.c4
-rw-r--r--libbb/make_directory.c4
-rw-r--r--libbb/remove_file.c8
3 files changed, 16 insertions, 0 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 9333a8d..a4be875 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)
bb_perror_msg("can't preserve %s of '%s'", "permissions", dest);
}
+ if (flags & FILEUTILS_VERBOSE) {
+ printf("'%s' -> '%s'\n", source, dest);
+ }
+
return retval;
}
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 7826b90..89352ca 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)
if (!c) {
goto ret0;
}
+ } else {
+ if (flags & FILEUTILS_VERBOSE) {
+ printf("created directory: '%s'\n", path);
+ }
}
if (!c) {
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 5b75f7f..eaca293 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)
return -1;
}
+ if (flags & FILEUTILS_VERBOSE) {
+ printf("removed directory: '%s'\n", path);
+ }
+
return status;
}
@@ -98,5 +102,9 @@ int FAST_FUNC remove_file(const char *path, int flags)
return -1;
}
+ if (flags & FILEUTILS_VERBOSE) {
+ printf("removed '%s'\n", path);
+ }
+
return 0;
}