ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hush: use SA_RESTARTed signal handlers across read.

Browse source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-05-11 11:49:21 +02:00
parent 12bc152b31
commit 10c0131a8a
2 changed files with 42 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
shell/shell_common.c
View file

@ -159,32 +159,40 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
bufpos = 0;
do {
char c;
struct pollfd pfd[1];
int timeout;
errno = 0;
if ((bufpos & 0xff) == 0)
buffer = xrealloc(buffer, bufpos + 0x100);
timeout = -1;
if (end_ms) {
int timeout;
struct pollfd pfd[1];
pfd[0].fd = fd;
pfd[0].events = POLLIN;
timeout = end_ms - (unsigned)monotonic_ms();
if (timeout <= 0 /* already late? */
|| poll(pfd, 1, timeout) != 1 /* no? wait... */
) { /* timed out! */
err = errno;
if (timeout <= 0) { /* already late? */
retval = (const char *)(uintptr_t)1;
goto ret;
}
}
if ((bufpos & 0xff) == 0)
buffer = xrealloc(buffer, bufpos + 0x100);
if (nonblock_immune_read(fd, &buffer[bufpos], 1, /*loop_on_EINTR:*/ 0) != 1) {
/* We must poll even if timeout is -1:
* we want to be interrupted if signal arrives,
* regardless of SA_RESTART-ness of that signal!
*/
errno = 0;
pfd[0].fd = fd;
pfd[0].events = POLLIN;
if (poll(pfd, 1, timeout) != 1) {
/* timed out, or EINTR */
err = errno;
retval = (const char *)(uintptr_t)1;
goto ret;
}
if (read(fd, &buffer[bufpos], 1) != 1) {
err = errno;
retval = (const char *)(uintptr_t)1;
break;
}
c = buffer[bufpos];
if (c == '\0')
continue;