From 084b7e69db699a0802f1fb58fcf33adeb3a5f3d3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 11 Jan 2017 22:36:01 +0100 Subject: Fix vu-repeat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/vu-repeat.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/vu-repeat.c b/src/vu-repeat.c index 0c0e510..367d976 100644 --- a/src/vu-repeat.c +++ b/src/vu-repeat.c @@ -14,7 +14,7 @@ int main(int argc, char *argv[]) { struct stream stream; - size_t count = 0, ptr, n; + size_t count = 0, ptr; ssize_t r; char buf[BUFSIZ]; int inf = 0; @@ -39,26 +39,21 @@ main(int argc, char *argv[]) efflush(stdout, ""); while (inf || count--) { - posix_fadvise(stream.fd, 0, 0, POSIX_FADV_SEQUENTIAL); - if (writeall(STDOUT_FILENO, stream.buf, stream.ptr)) - goto writeerr; - for (ptr = 0;;) { + posix_fadvise(stream.fd, stream.headlen, 0, POSIX_FADV_SEQUENTIAL); + for (ptr = stream.headlen;; ptr += (size_t)r) { r = pread(stream.fd, buf, sizeof(buf), ptr); if (r < 0) eprintf("pread %s:", stream.file); - else if (r == 0) + if (r == 0) break; - ptr += n = (size_t)r; - if (writeall(STDOUT_FILENO, buf, n)) - goto writeerr; + if (writeall(STDOUT_FILENO, buf, (size_t)r)) { + if (!inf || errno != EPIPE) + eprintf("write :"); + return 0; + } } } close(stream.fd); return 0; - -writeerr: - if (!inf || errno != EPIPE) - eprintf("write :"); - return 0; } -- cgit v1.2.3-70-g09d2