* Remove unneeded ctype.h

[bsd-progress.git] / progress.c

diff --git a/progress.c b/progress.c
index 3272ba2f2660ea57362d6482bdba79c15ee7711c..fbec39baf6ab61ae3757762217d420b0e482db02 100644 (file)
--- a/progress.c
+++ b/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.13 2007/02/07 14:06:57 hubertf Exp $ */

 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.


@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
 
 #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.13 2007/02/07 14:06:57 hubertf Exp $");

 #endif                         /* not lint */
 
 #include <sys/types.h>
 #endif                         /* not lint */
 
 #include <sys/types.h>


@@ -46,7 +46,6 @@ __RCSID("$NetBSD: progress.c,v 1.11 2006/01/12 20:33:20 garbled Exp $");
 #include <netinet/in.h>
 #include <arpa/ftp.h>
 
 #include <netinet/in.h>
 #include <arpa/ftp.h>
 

-#include <ctype.h>

 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>


@@ -75,7 +74,7 @@ usage(void)
        fprintf(stderr,
            "usage: %s [-ez] [-f file] [-l length] [-p prefix] cmd [args...]\n",
            getprogname());
        fprintf(stderr,
            "usage: %s [-ez] [-f file] [-l length] [-p prefix] cmd [args...]\n",
            getprogname());

-       exit(1);
+       exit(EXIT_FAILURE);

 }
 
 
 }
 
 


@@ -97,7 +96,7 @@ main(int argc, char *argv[])
        /* defaults: Read from stdin, 0 filesize (no completion estimate) */
        fd = STDIN_FILENO;
        filesize = 0;
        /* defaults: Read from stdin, 0 filesize (no completion estimate) */
        fd = STDIN_FILENO;
        filesize = 0;

-       prefix=NULL;
+       prefix = NULL;

 
        while ((ch = getopt(argc, argv, "ef:l:p:z")) != -1)
                switch (ch) {
 
        while ((ch = getopt(argc, argv, "ef:l:p:z")) != -1)
                switch (ch) {


@@ -118,8 +117,8 @@ main(int argc, char *argv[])
                case 'z':
                        zflag++;
                        break;
                case 'z':
                        zflag++;
                        break;

-               default:

                case '?':
                case '?':

+               default:

                        usage();
                        /* NOTREACHED */
                }
                        usage();
                        /* NOTREACHED */
                }


@@ -128,12 +127,21 @@ main(int argc, char *argv[])
 
        if (argc < 1)
                usage();
 
        if (argc < 1)
                usage();

+

        if (infile && (fd = open(infile, O_RDONLY, 0)) < 0)
                err(1, "%s", infile);
 
        /* stat() to get the filesize unless overridden, or -z */
        if (infile && (fd = open(infile, O_RDONLY, 0)) < 0)
                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) {
 
        /* gzip -l the file if we have the name and -z is given */
        if (zflag && !lflag && infile != NULL) {


@@ -188,9 +196,9 @@ main(int argc, char *argv[])
        progress = 1;
        ttyout = eflag ? stderr : stdout;
 
        progress = 1;
        ttyout = eflag ? stderr : stdout;
 

-       if (ioctl(fileno(ttyout), TIOCGSIZE, &ts) == -1) {
+       if (ioctl(fileno(ttyout), TIOCGSIZE, &ts) == -1)

                ttywidth = 80;
                ttywidth = 80;

-       } else
+       else

                ttywidth = ts.ts_cols;
 
        if (pipe(outpipe) < 0)
                ttywidth = ts.ts_cols;
 
        if (pipe(outpipe) < 0)