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 /libbb/appletlib.c | |
| 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 'libbb/appletlib.c')
| -rw-r--r-- | libbb/appletlib.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 6330b6f8b..71ee0dd07 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
| @@ -302,22 +302,6 @@ int FAST_FUNC find_applet_by_name(const char *name) | |||
| 302 | #endif | 302 | #endif |
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | # if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_NOFORK | ||
| 306 | int FAST_FUNC long_running_applet(int applet_no) | ||
| 307 | { | ||
| 308 | int ret = 0; | ||
| 309 | |||
| 310 | #if defined(APPLET_NO_seq) | ||
| 311 | ret |= (applet_no == APPLET_NO_seq); | ||
| 312 | #endif | ||
| 313 | #if defined(APPLET_NO_yes) | ||
| 314 | ret |= (applet_no == APPLET_NO_yes); | ||
| 315 | #endif | ||
| 316 | |||
| 317 | return ret; | ||
| 318 | } | ||
| 319 | #endif | ||
| 320 | |||
| 321 | 305 | ||
| 322 | void lbb_prepare(const char *applet | 306 | void lbb_prepare(const char *applet |
| 323 | IF_FEATURE_INDIVIDUAL(, char **argv)) | 307 | IF_FEATURE_INDIVIDUAL(, char **argv)) |