Module Name: src
Committed By: gson
Date: Sat Jan 17 10:57:51 UTC 2015
Modified Files:
src/usr.bin/progress: progress.c
Log Message:
Retry read() on EINTR. Fixes premature exit of
</dev/random progress -e cat >/dev/null
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/progress/progress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/progress/progress.c
diff -u src/usr.bin/progress/progress.c:1.20 src/usr.bin/progress/progress.c:1.21
--- src/usr.bin/progress/progress.c:1.20 Wed Jun 27 22:07:36 2012
+++ src/usr.bin/progress/progress.c Sat Jan 17 10:57:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.20 2012/06/27 22:07:36 riastradh Exp $ */
+/* $NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.20 2012/06/27 22:07:36 riastradh Exp $");
+__RCSID("$NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -228,7 +228,12 @@ main(int argc, char *argv[])
signal(SIGPIPE, broken_pipe);
progressmeter(-1);
- while ((nr = read(fd, fb_buf, buffersize)) > 0)
+ while (1) {
+ do {
+ nr = read(fd, fb_buf, buffersize);
+ } while (nr < 0 && errno == EINTR);
+ if (nr <= 0)
+ break;
for (off = 0; nr; nr -= nw, off += nw, bytes += nw)
if ((nw = write(outpipe[1], fb_buf + off,
(size_t) nr)) < 0) {
@@ -236,6 +241,7 @@ main(int argc, char *argv[])
err(1, "writing %u bytes to output pipe",
(unsigned) nr);
}
+ }
close(outpipe[1]);
gzipstat = 0;
