diff options
Diffstat (limited to 'coreutils/rm.c')
-rw-r--r-- | coreutils/rm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c index f91c94570..b68a82dc4 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c | |||
@@ -16,7 +16,8 @@ | |||
16 | //config: help | 16 | //config: help |
17 | //config: rm is used to remove files or directories. | 17 | //config: rm is used to remove files or directories. |
18 | 18 | ||
19 | //applet:IF_RM(APPLET_NOFORK(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm)) | 19 | //applet:IF_RM(APPLET_NOEXEC(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm)) |
20 | /* was NOFORK, but then "rm -i FILE" can't be ^C'ed if run by hush */ | ||
20 | 21 | ||
21 | //kbuild:lib-$(CONFIG_RM) += rm.o | 22 | //kbuild:lib-$(CONFIG_RM) += rm.o |
22 | 23 | ||
@@ -36,7 +37,7 @@ | |||
36 | 37 | ||
37 | #include "libbb.h" | 38 | #include "libbb.h" |
38 | 39 | ||
39 | /* This is a NOFORK applet. Be very careful! */ | 40 | /* This is a NOEXEC applet. Be very careful! */ |
40 | 41 | ||
41 | int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 42 | int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
42 | int rm_main(int argc UNUSED_PARAM, char **argv) | 43 | int rm_main(int argc UNUSED_PARAM, char **argv) |
@@ -45,8 +46,7 @@ int rm_main(int argc UNUSED_PARAM, char **argv) | |||
45 | int flags = 0; | 46 | int flags = 0; |
46 | unsigned opt; | 47 | unsigned opt; |
47 | 48 | ||
48 | opt_complementary = "f-i:i-f"; | 49 | opt = getopt32(argv, "^" "fiRrv" "\0" "f-i:i-f"); |
49 | opt = getopt32(argv, "fiRrv"); | ||
50 | argv += optind; | 50 | argv += optind; |
51 | if (opt & 1) | 51 | if (opt & 1) |
52 | flags |= FILEUTILS_FORCE; | 52 | flags |= FILEUTILS_FORCE; |