From dac6950d9e556d5521ad7913d27a6cf83e2a90a1 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 9 Apr 2017 23:46:17 +0200 Subject: Clean up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/blind-read-head.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/blind-read-head.c') diff --git a/src/blind-read-head.c b/src/blind-read-head.c index c31e2b0..00b6d61 100644 --- a/src/blind-read-head.c +++ b/src/blind-read-head.c @@ -14,15 +14,11 @@ main(int argc, char *argv[]) char magic[] = {'\0', 'u', 'i', 'v', 'f'}; char b, *p; size_t i, ptr; - ssize_t r; UNOFLAGS(argc); for (ptr = 0; ptr < sizeof(buf);) { - r = read(STDIN_FILENO, buf + ptr, 1); - if (r < 0) - eprintf("read :"); - if (r == 0) + if (!eread(STDIN_FILENO, buf + ptr, 1, "")) goto bad_format; if (buf[ptr++] == '\n') break; @@ -31,13 +27,9 @@ main(int argc, char *argv[]) goto bad_format; p = buf; - for (i = 0; i < 5; i++) { - r = read(STDIN_FILENO, &b, 1); - if (r < 0) - eprintf("read :"); - if (r == 0 || b != magic[i]) + for (i = 0; i < 5; i++) + if (!eread(STDIN_FILENO, &b, 1, "") || b != magic[i]) goto bad_format; - } for (i = 0; i < 3; i++) { if (!isdigit(*p)) -- cgit v1.2.3-70-g09d2