summaryrefslogtreecommitdiff
path: root/coreutils/rm.c
diff options
context:
space:
mode:
authorDenys Vlasenko2017-08-02 16:37:39 +0200
committerDenys Vlasenko2017-08-02 16:37:39 +0200
commit7c40ddd9500907925041131374cb43eb87ef5494 (patch)
tree415676f7439a3c42e2137f357c8e8904a93007cc /coreutils/rm.c
parent95f7953f2c46c7b9c799250aa8dc6eb10cc5c726 (diff)
downloadbusybox-7c40ddd9500907925041131374cb43eb87ef5494.zip
busybox-7c40ddd9500907925041131374cb43eb87ef5494.tar.gz
NOFORK fixes
"rm -i FILE" and "yes" can now be interrupted by ^C in hush. This also now works: $ usleep 19999999 ^C $ echo $? 130 function old new delta run_pipe 1668 1711 +43 pseudo_exec_argv 312 321 +9 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/0 up/down: 52/0) Total: 52 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/rm.c')
-rw-r--r--coreutils/rm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c
index f91c945..5e4acab 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)