From 17f8418ea75410c3fbf9c9558f50f22cb8808e3e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 19 May 2014 16:23:50 +0200 Subject: Add conditional support for -v / --verbose MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- coreutils/mv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'coreutils/mv.c') 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 = "interactive\0" No_argument "i" "force\0" No_argument "f" "no-clobber\0" No_argument "n" + IF_FEATURE_VERBOSE( "verbose\0" No_argument "v" + ) ; #endif #define OPT_FORCE (1 << 0) #define OPT_INTERACTIVE (1 << 1) #define OPT_NOCLOBBER (1 << 2) +#define OPT_VERBOSE ((1 << 3) * ENABLE_FEATURE_VERBOSE) + int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mv_main(int argc, char **argv) @@ -58,7 +62,6 @@ int mv_main(int argc, char **argv) /* Need at least two arguments. * If more than one of -f, -i, -n is specified , only the final one * takes effect (it unsets previous options). - * -v is accepted but ignored. */ opt_complementary = "-2:f-in:i-fn:n-fi"; flags = getopt32(argv, "finv"); @@ -148,6 +151,9 @@ int mv_main(int argc, char **argv) status = 1; } RET_0: + if (flags & OPT_VERBOSE) { + printf("'%s' -> '%s'\n", *argv, dest); + } if (dest != last) { free((void *) dest); } -- cgit v1.2.3