Merge branch 'busybox' into merge

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 @@
 //config:       help
 //config:       rm is used to remove files or directories.
 
-//applet:IF_RM(APPLET_NOFORK(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
+//applet:IF_RM(APPLET_NOEXEC(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
+/* was NOFORK, but then "rm -i FILE" can't be ^C'ed if run by hush */
 
 //kbuild:lib-$(CONFIG_RM) += rm.o
 
@@ -36,7 +37,7 @@
 
 #include "libbb.h"
 
-/* This is a NOFORK applet. Be very careful! */
+/* This is a NOEXEC applet. Be very careful! */
 
 int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rm_main(int argc UNUSED_PARAM, char **argv)
@@ -45,8 +46,7 @@ int rm_main(int argc UNUSED_PARAM, char **argv)
         int flags = 0;
         unsigned opt;
 
-        opt_complementary = "f-i:i-f";
-        opt = getopt32(argv, "fiRrv");
+        opt = getopt32(argv, "^" "fiRrv" "\0" "f-i:i-f");
         argv += optind;
         if (opt & 1)
                 flags |= FILEUTILS_FORCE;