diff options
| author | Mattias Andrée <maandree@kth.se> | 2017-04-09 23:46:17 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2017-04-09 23:46:17 +0200 |
| commit | dac6950d9e556d5521ad7913d27a6cf83e2a90a1 (patch) | |
| tree | bb6a65d973337a0504117888d5534967cc51f479 /src/blind-read-head.c | |
| parent | Clean up (diff) | |
| download | blind-dac6950d9e556d5521ad7913d27a6cf83e2a90a1.tar.gz blind-dac6950d9e556d5521ad7913d27a6cf83e2a90a1.tar.bz2 blind-dac6950d9e556d5521ad7913d27a6cf83e2a90a1.tar.xz | |
Clean up
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/blind-read-head.c')
| -rw-r--r-- | src/blind-read-head.c | 14 |
1 files changed, 3 insertions, 11 deletions
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 <stdin>:"); - if (r == 0) + if (!eread(STDIN_FILENO, buf + ptr, 1, "<stdin>")) 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 <stdin>:"); - if (r == 0 || b != magic[i]) + for (i = 0; i < 5; i++) + if (!eread(STDIN_FILENO, &b, 1, "<stdin>") || b != magic[i]) goto bad_format; - } for (i = 0; i < 3; i++) { if (!isdigit(*p)) |