emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: INT_OFF/INT_ON around run_nofork_applet()

Browse Source 
function                                             old     new   delta
evalcommand                                         1441    1447      +6

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-04 14:50:03 +02:00
parent 49e6bf2db9
commit d329e34c96
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/ash.c
View File

@ -9919,10 +9919,26 @@ evalcommand(union node *cmd, int flags)
int applet_no = (- cmdentry.u.index - 2); int applet_no = (- cmdentry.u.index - 2);
if (applet_no >= 0 && APPLET_IS_NOFORK(applet_no)) { if (applet_no >= 0 && APPLET_IS_NOFORK(applet_no)) {
listsetvar(varlist.list, VEXPORT|VSTACK); listsetvar(varlist.list, VEXPORT|VSTACK);
/* run <applet>_main() */ /*
//FIXME: do we need INT_OFF / INT_ON here? * Run <applet>_main().
//wouldn't open files and allocations leak on ^C otherwise? * Signals (^C) can't interrupt here.
* Otherwise we can mangle stdio or malloc internal state.
* This makes applets which can run for a long time
* and/or wait for user input ineligible for NOFORK:
* for example, "yes" or "rm" (rm -i waits for input).
*/
INT_OFF;
status = run_nofork_applet(applet_no, argv); status = run_nofork_applet(applet_no, argv);
/*
* Try enabling NOFORK for "yes" applet.
* ^C _will_ stop it (write returns EINTR),
* but this causes stdout FILE to be stuck
* and needing clearerr(). What if other applets
* also can get EINTRs? Do we need to switch
* our signals to SA_RESTART?
*/
/*clearerr(stdout);*/
INT_ON;
break; break;
} }
#endif #endif