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/install.c | |
| parent | 539e2802ebd2680602de0a2c76069b7f555392d9 (diff) | |
| download | 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 'coreutils/install.c')
| -rw-r--r-- | coreutils/install.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/coreutils/install.c b/coreutils/install.c index 445497f9a..6c88ae11c 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -28,6 +28,9 @@ #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS static const char install_longopts[] ALIGN1 = + IF_FEATURE_VERBOSE( + "verbose\0" No_argument "v" + ) "directory\0" No_argument "d" "preserve-timestamps\0" No_argument "p" "strip\0" No_argument "s" @@ -89,6 +92,7 @@ int install_main(int argc, char **argv) const char *gid_str; const char *uid_str; const char *mode_str; + int mkdir_flags = FILEUTILS_RECUR; int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE; int opts; int min_args = 1; @@ -120,7 +124,6 @@ int install_main(int argc, char **argv) #endif opt_complementary = "s--d:d--s" IF_FEATURE_INSTALL_LONG_OPTIONS(IF_SELINUX(":Z--\xff:\xff--Z")); /* -c exists for backwards compatibility, it's needed */ - /* -v is ignored ("print name of each created directory") */ /* -b is ignored ("make a backup of each existing destination file") */ opts = getopt32(argv, "cvb" "Ddpsg:m:o:" IF_SELINUX("Z:"), &gid_str, &mode_str, &uid_str IF_SELINUX(, &scontext)); @@ -141,6 +144,11 @@ int install_main(int argc, char **argv) } #endif + if ((opts & OPT_v) && FILEUTILS_VERBOSE) { + mkdir_flags |= FILEUTILS_VERBOSE; + copy_flags |= FILEUTILS_VERBOSE; + } + /* preserve access and modification time, this is GNU behaviour, * BSD only preserves modification time */ if (opts & OPT_PRESERVE_TIME) { @@ -171,14 +179,14 @@ int install_main(int argc, char **argv) /* GNU coreutils 6.9 does not set uid:gid * on intermediate created directories * (only on last one) */ - if (bb_make_directory(dest, 0755, FILEUTILS_RECUR)) { + if (bb_make_directory(dest, 0755, mkdir_flags)) { ret = EXIT_FAILURE; goto next; } } else { if (opts & OPT_MKDIR_LEADING) { char *ddir = xstrdup(dest); - bb_make_directory(dirname(ddir), 0755, FILEUTILS_RECUR); + bb_make_directory(dirname(ddir), 0755, mkdir_flags); /* errors are not checked. copy_file * will fail if dir is not created. */ free(ddir); |