blind

commit 664c54ec31217e4939f12ee9a848ed4ac38561b6
parent 084b7e69db699a0802f1fb58fcf33adeb3a5f3d3
Author: Mattias Andrée <maandree@kth.se>
Date:   Wed, 11 Jan 2017 23:57:29 +0100

Fix writeall + vu-split: reuse code

Signed-off-by: Mattias Andrée <maandree@kth.se>

Diffstat:
M
src/util.c
 | 
2
+-
M
src/vu-split.c
 | 
18
++++++------------

2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/util.c b/src/util.c
@@ -110,7 +110,7 @@ writeall(int fd, void *buf, size_t n)
 	size_t ptr = 0;
 	ssize_t r;
 	while (ptr < n) {
-		r = write(STDOUT_FILENO, buffer, n);
+		r = write(fd, buffer, n);
 		if (r < 0)
 			return -1;
 		buffer += (size_t)ptr;
diff --git a/src/vu-split.c b/src/vu-split.c
@@ -15,10 +15,9 @@ int
 main(int argc, char *argv[])
 {
 	struct stream stream;
-	size_t *ends, i, parts, ptr, end, frame_size, max, ptw, n;
+	size_t *ends, i, parts, ptr, end, frame_size, n;
 	FILE *fp;
 	int fd;
-	ssize_t r;
 
 	ENOFLAGS(argc < 2 || argc % 2);
 
@@ -54,17 +53,12 @@ main(int argc, char *argv[])
 		efflush(fp, argv[i * 2]);
 
 		for (end = ends[i] * frame_size; ptr < end; ptr += n) {
-			for (ptw = ptr; stream.ptr && ptw < end;) {
-				max = end - ptw;
-				max = max < stream.ptr ? max : stream.ptr;
-				r = write(fd, stream.buf, max);
-				if (r < 0)
-					eprintf("write %s:\n", argv[i * 2]);
-				memmove(stream.buf, stream.buf + r, stream.ptr - (size_t)r);
-			}
-			n = eread_stream(&stream, end - ptr);
-			if (n == 0)
+			if (stream.ptr == sizeof(stream.buf))
+				n = stream.ptr < end - ptr ? stream.ptr : end - ptr;
+			else if (!(n = eread_stream(&stream, end - ptr)))
 				eprintf("%s: file is shorter than expected\n", stream.file);
+			ewriteall(STDOUT_FILENO, stream.buf, n, "<stdout>");
+			memmove(stream.buf, stream.buf + n, stream.ptr -= n);
 		}
 
 		if (fclose(fp))