aboutsummaryrefslogtreecommitdiff
path: root/coreutils/rm.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/rm.c')
-rw-r--r--coreutils/rm.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 5489350e5..39609e7b8 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -36,22 +36,16 @@ extern int rm_main(int argc, char **argv)
36{ 36{
37 int status = 0; 37 int status = 0;
38 int flags = 0; 38 int flags = 0;
39 int opt; 39 unsigned long opt;
40 40
41 while ((opt = getopt(argc, argv, "fiRr")) > 0) { 41 bb_opt_complementaly = "f-i:i-f";
42 if ((opt == 'r') || (opt == 'R')) { 42 opt = bb_getopt_ulflags(argc, argv, "fiRr");
43 flags |= FILEUTILS_RECUR; 43 if(opt & 1)
44 } else {
45 flags &= ~(FILEUTILS_INTERACTIVE | FILEUTILS_FORCE);
46 if (opt == 'i') {
47 flags |= FILEUTILS_INTERACTIVE;
48 } else if (opt == 'f') {
49 flags |= FILEUTILS_FORCE; 44 flags |= FILEUTILS_FORCE;
50 } else { 45 if(opt & 2)
51 bb_show_usage(); 46 flags |= FILEUTILS_INTERACTIVE;
52 } 47 if(opt & 12)
53 } 48 flags |= FILEUTILS_RECUR;
54 }
55 49
56 if (*(argv += optind) != NULL) { 50 if (*(argv += optind) != NULL) {
57 do { 51 do {