leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: kwboot: properly quit when read() returns 0

Browse Source 
When kwboot is attached to a terminal which disappears such as one
connected via an unplugged USB cable, read() returns 0, making kwboot
loop until a key is pressed in the terminal. The only case where read()
may return 0 here is when the terminal is closed anyway, so let's
properly handle this one and report is similar to other errors.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Willy Tarreau 2018-07-03 12:10:31 -04:00 committed by Stefan Roese
parent 3475a71d4e
commit 4469bd7b53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/kwboot.c
View File

@ -182,7 +182,7 @@ kwboot_tty_recv(int fd, void *buf, size_t len, int timeo)
} }
n = read(fd, buf, len); n = read(fd, buf, len);
if (n < 0) if (n <= 0)
goto out; goto out;
buf = (char *)buf + n; buf = (char *)buf + n;
@ -466,7 +466,7 @@ kwboot_term_pipe(int in, int out, char *quit, int *s)
char _buf[128], *buf = _buf; char _buf[128], *buf = _buf;
nin = read(in, buf, sizeof(buf)); nin = read(in, buf, sizeof(buf));
if (nin < 0) if (nin <= 0)
return -1; return -1;
if (quit) { if (quit) {