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

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];
if (c == '\0')
continue;
if (backslash) {
backslash = 0;
if (c != '\n')
goto put;
continue;
}
if (!(read_flags & BUILTIN_READ_RAW) && c == '\\') {
backslash = 1;
continue;
if (!(read_flags & BUILTIN_READ_RAW)) {
if (backslash) {
backslash = 0;
if (c != '\n')
goto put;
continue;
}
if (c == '\\') {
backslash = 1;
continue;
}
}
if (c == '\n')
break;