not all windows have 80 columns.

diff --git a/progress.c b/progress.c
index 5db052e2e7b1fabbd4332dd5e7e7a54b0e84c2d6..23c075b98b063b3e2a3e1807b2f797eab57585ee 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: progress.c,v 1.2 2003/01/22 03:13:32 enami Exp $ */
+/*     $NetBSD: progress.c,v 1.3 2003/01/22 03:24:21 christos Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.2 2003/01/22 03:13:32 enami Exp $");
+__RCSID("$NetBSD: progress.c,v 1.3 2003/01/22 03:24:21 christos Exp $");
 #endif                         /* not lint */
 
 #include <sys/types.h>
@@ -89,6 +89,7 @@ main(int argc, char *argv[])
        int lflag = 0, zflag = 0;
        ssize_t nr, nw, off;
        struct stat statb;
+       struct ttysize ts;
 
        setprogname(argv[0]);
 
@@ -179,7 +180,12 @@ main(int argc, char *argv[])
        bytes = 0;
        progress = 1;
        ttyout = stdout;
-       ttywidth = 80;
+
+       if (ioctl(fileno(ttyout), TIOCGSIZE, &ts) == -1) {
+               warn("could not get tty window size");
+               ttywidth = 80;
+       } else
+               ttywidth = ts.ts_cols;
 
        if (pipe(outpipe) < 0)
                err(1, "output pipe");