aboutsummaryrefslogtreecommitdiff
path: root/tools/kwboot.c
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2018-07-03 12:10:31 -0400
committerStefan Roese <sr@denx.de>2018-08-07 10:53:52 +0200
commit4469bd7b53acea642915e2bf0e3cb5dfa378a47e (patch)
treef372479f23f3d10e0ee0c68da4be7c2ea6cc567b /tools/kwboot.c
parent3475a71d4e7696865ebc710e56621b04d56a621e (diff)
downloadu-boot-4469bd7b53acea642915e2bf0e3cb5dfa378a47e.zip
u-boot-4469bd7b53acea642915e2bf0e3cb5dfa378a47e.tar.gz
u-boot-4469bd7b53acea642915e2bf0e3cb5dfa378a47e.tar.bz2
tools: kwboot: properly quit when read() returns 0
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>
Diffstat (limited to 'tools/kwboot.c')
-rw-r--r--tools/kwboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/kwboot.c b/tools/kwboot.c
index 0a77060..50ae2b4 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -182,7 +182,7 @@ kwboot_tty_recv(int fd, void *buf, size_t len, int timeo)
}
n = read(fd, buf, len);
- if (n < 0)
+ if (n <= 0)
goto out;
buf = (char *)buf + n;
@@ -466,7 +466,7 @@ kwboot_term_pipe(int in, int out, char *quit, int *s)
char _buf[128], *buf = _buf;
nin = read(in, buf, sizeof(buf));
- if (nin < 0)
+ if (nin <= 0)
return -1;
if (quit) {