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

ash,hush: fix SIGCHLD interrupting read builtin

Browse Source 
function                                             old     new   delta
readcmd                                              169     217     +48
shell_builtin_read                                  1087    1097     +10
localcmd                                             366     364      -2
builtin_read                                         197     193      -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 58/-6)              Total: 52 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2017-05-22 19:34:45 +02:00
parent 0c63299b84
commit f547041940
7 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/ash.c
View File

@@ -13268,6 +13268,7 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
/* "read -s" needs to save/restore termios, can't allow ^C
* to jump out of it.
*/
again:
INT_OFF;
r = shell_builtin_read(setvar0,
argptr,
@@ -13280,6 +13281,12 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
);
INT_ON;
if ((uintptr_t)r == 1 && errno == EINTR) {
/* to get SIGCHLD: sleep 1 & read x; echo $x */
if (pending_sig == 0)
goto again;
}
if ((uintptr_t)r > 1)
ash_msg_and_raise_error(r);