diff options
| author | Denys Vlasenko | 2017-08-04 02:20:19 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-08-04 02:20:19 +0200 |
| commit | cf792a58abc4fc55d0622333d0eb17c6a80dc497 (patch) | |
| tree | bd740050c3ac79b0db76bd29728dd4d29120ccc6 /coreutils/rm.c | |
| parent | 0a53eadea528673a813c5f9312b1f53130429f7c (diff) | |
| download | busybox-cf792a58abc4fc55d0622333d0eb17c6a80dc497.zip busybox-cf792a58abc4fc55d0622333d0eb17c6a80dc497.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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coreutils/rm.c b/coreutils/rm.c index cec34cb..158c69b 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) |