diff options
author | Ron Yorston <rmy@pobox.com> | 2017-08-22 15:30:29 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 15:30:29 +0100 |
commit | 594aac64fb94168c5345dd53a1e0231ed7c78418 (patch) | |
tree | 287fb5c9e57efdb40056c0ef234d5d870dde5103 /shell | |
parent | bcacae6da4e772f208ef2026fae5faaac9048411 (diff) | |
download | busybox-w32-594aac64fb94168c5345dd53a1e0231ed7c78418.tar.gz busybox-w32-594aac64fb94168c5345dd53a1e0231ed7c78418.tar.bz2 busybox-w32-594aac64fb94168c5345dd53a1e0231ed7c78418.zip |
Revert "ash: allow long-running nofork applets to be interrupted"
This reverts commit f5051d07f196a8ff7aeaae762333d5aa2b824088.
Upstream made 'yes' and 'seq' NOEXEC rather than NOFORK which also solves
the problem, though NOEXEC doesn't provide any gain in busybox-w32.
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/shell/ash.c b/shell/ash.c index ac1ae05fc..af0c68dcf 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -10394,15 +10394,7 @@ evalcommand(union node *cmd, int flags) | |||
10394 | */ | 10394 | */ |
10395 | /* find_command() encodes applet_no as (-2 - applet_no) */ | 10395 | /* find_command() encodes applet_no as (-2 - applet_no) */ |
10396 | int applet_no = (- cmdentry.u.index - 2); | 10396 | int applet_no = (- cmdentry.u.index - 2); |
10397 | if (applet_no >= 0 && APPLET_IS_NOFORK(applet_no) | 10397 | if (applet_no >= 0 && APPLET_IS_NOFORK(applet_no)) { |
10398 | #if ENABLE_PLATFORM_MINGW32 | ||
10399 | /* | ||
10400 | * Fork long-running nofork applets (e.g. yes) in interactive | ||
10401 | * sessions. Otherwise ctrl-c won't let the user kill them. | ||
10402 | */ | ||
10403 | && !(iflag && long_running_applet(applet_no)) | ||
10404 | #endif | ||
10405 | ) { | ||
10406 | listsetvar(varlist.list, VEXPORT|VSTACK); | 10398 | listsetvar(varlist.list, VEXPORT|VSTACK); |
10407 | /* | 10399 | /* |
10408 | * Run <applet>_main(). | 10400 | * Run <applet>_main(). |