diff options
author | Ron Yorston <rmy@pobox.com> | 2014-06-30 21:13:06 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-06-30 21:13:06 +0100 |
commit | 099e8b6438345baae560a629d548af07a8c3125c (patch) | |
tree | 71b5600b22b0019af675e4a991394ce32c8207c5 /coreutils/rm.c | |
parent | e19594cc6e49e78fa50a654f15cf9a04e77d054a (diff) | |
parent | 184b2669175e562d58894e22f6320cebf3316c25 (diff) | |
download | busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.tar.gz busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.tar.bz2 busybox-w32-099e8b6438345baae560a629d548af07a8c3125c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/rm.c')
-rw-r--r-- | coreutils/rm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c index 042fba162..d0ad81dfc 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c | |||
@@ -38,7 +38,6 @@ int rm_main(int argc UNUSED_PARAM, char **argv) | |||
38 | unsigned opt; | 38 | unsigned opt; |
39 | 39 | ||
40 | opt_complementary = "f-i:i-f"; | 40 | opt_complementary = "f-i:i-f"; |
41 | /* -v (verbose) is ignored */ | ||
42 | opt = getopt32(argv, "fiRrv"); | 41 | opt = getopt32(argv, "fiRrv"); |
43 | argv += optind; | 42 | argv += optind; |
44 | if (opt & 1) | 43 | if (opt & 1) |
@@ -47,6 +46,8 @@ int rm_main(int argc UNUSED_PARAM, char **argv) | |||
47 | flags |= FILEUTILS_INTERACTIVE; | 46 | flags |= FILEUTILS_INTERACTIVE; |
48 | if (opt & (8|4)) | 47 | if (opt & (8|4)) |
49 | flags |= FILEUTILS_RECUR; | 48 | flags |= FILEUTILS_RECUR; |
49 | if ((opt & 16) && FILEUTILS_VERBOSE) | ||
50 | flags |= FILEUTILS_VERBOSE; | ||
50 | 51 | ||
51 | if (*argv != NULL) { | 52 | if (*argv != NULL) { |
52 | do { | 53 | do { |