aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2017-08-01 19:47:20 +0100
committerRon Yorston <rmy@pobox.com>2017-08-01 19:47:20 +0100
commitf5051d07f196a8ff7aeaae762333d5aa2b824088 (patch)
tree3b61563a88c7fe57fddc4bc24a6a42b7ea755c21 /libbb
parent2a210715a9a85fb48cf8f636c74e63f54605eedc (diff)
downloadbusybox-w32-f5051d07f196a8ff7aeaae762333d5aa2b824088.tar.gz
busybox-w32-f5051d07f196a8ff7aeaae762333d5aa2b824088.tar.bz2
busybox-w32-f5051d07f196a8ff7aeaae762333d5aa2b824088.zip
ash: allow long-running nofork applets to be interrupted
Nofork applets can't be interrupted with ctrl-c. This isn't an issue for most such applets because they do very little and won't run for very long. However 'yes' and 'seq 10000000' can't be interrupted in a interactive shell, which is awkward. As a special case ignore the nofork-ness of these applets if they're run from an interactive shell. This isn't foolproof as there are still ways to run them such that they can't be interrupted, but it helps.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/appletlib.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3cdf0c613..401475f18 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -310,6 +310,22 @@ int FAST_FUNC find_applet_by_name(const char *name)
310#endif 310#endif
311} 311}
312 312
313# if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_NOFORK
314int FAST_FUNC long_running_applet(int applet_no)
315{
316 int ret = 0;
317
318#if defined(APPLET_NO_seq)
319 ret |= (applet_no == APPLET_NO_seq);
320#endif
321#if defined(APPLET_NO_yes)
322 ret |= (applet_no == APPLET_NO_yes);
323#endif
324
325 return ret;
326}
327#endif
328
313 329
314void lbb_prepare(const char *applet 330void lbb_prepare(const char *applet
315 IF_FEATURE_INDIVIDUAL(, char **argv)) 331 IF_FEATURE_INDIVIDUAL(, char **argv))