summaryrefslogtreecommitdiff
path: root/coreutils/rmdir.c
diff options
context:
space:
mode:
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 cc2dea0..0792a1c 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)