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
Show Stats 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 /* "read -s" needs to save/restore termios, can't allow ^C
* to jump out of it. * to jump out of it.
*/ */
again:
INT_OFF; INT_OFF;
r = shell_builtin_read(setvar0, r = shell_builtin_read(setvar0,
argptr, argptr,
@ -13280,6 +13281,12 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
); );
INT_ON; 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) if ((uintptr_t)r > 1)
ash_msg_and_raise_error(r); ash_msg_and_raise_error(r);

2
shell/ash_test/ash-read/read_SIGCHLD.right Normal file
View File

@ -0,0 +1,2 @@
x='Ok'
exitcode:0

4
shell/ash_test/ash-read/read_SIGCHLD.tests Executable file
View File

@ -0,0 +1,4 @@
x=BAD
{ sleep 0.4; echo Ok; } | { sleep 0.2 & read x; echo "x='$x'"; }
echo "exitcode:$?"

5
shell/hush.c
View File

@ -9038,6 +9038,9 @@ static int FAST_FUNC builtin_type(char **argv)
* - terminates shell (regardless of interactivity); * - terminates shell (regardless of interactivity);
* if it has non-empty trap: * if it has non-empty trap:
* - executes trap and returns to read; * - executes trap and returns to read;
* SIGCHLD from children:
* - does not interrupt read regardless of interactivity:
* try: sleep 1 & read x; echo $x
*/ */
static int FAST_FUNC builtin_read(char **argv) static int FAST_FUNC builtin_read(char **argv)
{ {
@ -9071,7 +9074,7 @@ static int FAST_FUNC builtin_read(char **argv)
if ((uintptr_t)r == 1 && errno == EINTR) { if ((uintptr_t)r == 1 && errno == EINTR) {
unsigned sig = check_and_run_traps(); unsigned sig = check_and_run_traps();
if (sig && sig != SIGINT) if (sig != SIGINT)
goto again; goto again;
} }

2
shell/hush_test/hush-read/read_SIGCHLD.right Normal file
View File

@ -0,0 +1,2 @@
x='Ok'
exitcode:0

4
shell/hush_test/hush-read/read_SIGCHLD.tests Executable file
View File

@ -0,0 +1,4 @@
x=BAD
{ sleep 0.4; echo Ok; } | { sleep 0.2 & read x; echo "x='$x'"; }
echo "exitcode:$?"

20
shell/shell_common.c
View File

@ -204,15 +204,17 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
c = buffer[bufpos]; c = buffer[bufpos];
if (c == '\0') if (c == '\0')
continue; continue;
if (backslash) { if (!(read_flags & BUILTIN_READ_RAW)) {
backslash = 0; if (backslash) {
if (c != '\n') backslash = 0;
goto put; if (c != '\n')
continue; goto put;
} continue;
if (!(read_flags & BUILTIN_READ_RAW) && c == '\\') { }
backslash = 1; if (c == '\\') {
continue; backslash = 1;
continue;
}
} }
if (c == '\n') if (c == '\n')
break; break;