summaryrefslogtreecommitdiff
path: root/usr.bin/progress/progress.c
diff options
context:
space:
mode:
authorhubertf <hubertf@NetBSD.org>2006-04-20 23:20:55 +0000
committerhubertf <hubertf@NetBSD.org>2006-04-20 23:20:55 +0000
commitce8f04b19d441a3eca54ccddac4171e26f90af47 (patch)
treefed412d89ea1981c62d2b876541b6cabadcc4334 /usr.bin/progress/progress.c
parent61458fa35f79fc45f8eceed87b76894ffe131357 (diff)
Don't try to determining the size of what's coming when reading from a pipe.
Instead of reporting some bogus values, print no progress at all. (It's beyond me why stat(2) on a pipe returns funny values... see the PR below for some examples!) Fixes PR bin/33207 by myself. OK'd by mrg@
Diffstat (limited to 'usr.bin/progress/progress.c')
-rw-r--r--usr.bin/progress/progress.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/usr.bin/progress/progress.c b/usr.bin/progress/progress.c
index 3272ba2f266..a598ec3632f 100644
--- a/usr.bin/progress/progress.c
+++ b/usr.bin/progress/progress.c
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.11 2006/01/12 20:33:20 garbled Exp $ */
+/* $NetBSD: progress.c,v 1.12 2006/04/20 23:20:55 hubertf Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.11 2006/01/12 20:33:20 garbled Exp $");
+__RCSID("$NetBSD: progress.c,v 1.12 2006/04/20 23:20:55 hubertf Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -132,8 +132,16 @@ main(int argc, char *argv[])
err(1, "%s", infile);
/* stat() to get the filesize unless overridden, or -z */
- if (!zflag && !lflag && (fstat(fd, &statb) == 0))
- filesize = statb.st_size;
+ if (!zflag && !lflag && (fstat(fd, &statb) == 0)) {
+ if (S_ISFIFO(statb.st_mode)) {
+ /* stat(2) on pipe may return only the
+ * first few bytes with more coming.
+ * Don't trust!
+ */
+ } else {
+ filesize = statb.st_size;
+ }
+ }
/* gzip -l the file if we have the name and -z is given */
if (zflag && !lflag && infile != NULL) {