aboutsummaryrefslogtreecommitdiff
path: root/coreutils/rmdir.c
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2014-05-19 16:23:50 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2014-05-19 16:23:50 +0200
commit17f8418ea75410c3fbf9c9558f50f22cb8808e3e (patch)
tree9b9a7d6296ffb77c8b855eb34b8cbf03b960e005 /coreutils/rmdir.c
parent539e2802ebd2680602de0a2c76069b7f555392d9 (diff)
downloadbusybox-17f8418ea75410c3fbf9c9558f50f22cb8808e3e.tar.gz
busybox-17f8418ea75410c3fbf9c9558f50f22cb8808e3e.tar.bz2
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/rmdir.c')
-rw-r--r--coreutils/rmdir.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index cc2dea010..0792a1c8e 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -31,7 +31,7 @@
#define PARENTS (1 << 0)
-//efine VERBOSE (1 << 1) //accepted but ignored
+#define VERBOSE ((1 << 1) * ENABLE_FEATURE_VERBOSE)
#define IGNORE_NON_EMPTY (1 << 2)
int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -44,10 +44,12 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
static const char rmdir_longopts[] ALIGN1 =
"parents\0" No_argument "p"
- "verbose\0" No_argument "v"
/* Debian etch: many packages fail to be purged or installed
* because they desperately want this option: */
"ignore-fail-on-non-empty\0" No_argument "\xff"
+ IF_FEATURE_VERBOSE(
+ "verbose\0" No_argument "v"
+ )
;
applet_long_options = rmdir_longopts;
#endif
@@ -62,6 +64,10 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
path = *argv;
while (1) {
+ if (flags & VERBOSE) {
+ printf("rmdir: removing directory, '%s'\n", path);
+ }
+
if (rmdir(path) < 0) {
#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY)