Use the IEC 60027-2 2^n based "KiB", "MiB", "GiB", (etc)

[bsd-progress.git] / progress.c

diff --git a/progress.c b/progress.c
index eaa331477b627e1fd1faeb900e2886a61436d2b6..79076f9eaa4ca1c6266af46eead93ee7283df62a 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: progress.c,v 1.8 2004/03/09 17:04:24 hubertf Exp $ */
+/*     $NetBSD: progress.c,v 1.14 2007/02/07 15:21:21 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.8 2004/03/09 17:04:24 hubertf Exp $");
+__RCSID("$NetBSD: progress.c,v 1.14 2007/02/07 15:21:21 hubertf Exp $");
 #endif                         /* not lint */
 
 #include <sys/types.h>
@@ -46,12 +46,12 @@ __RCSID("$NetBSD: progress.c,v 1.8 2004/03/09 17:04:24 hubertf Exp $");
 #include <netinet/in.h>
 #include <arpa/ftp.h>
 
-#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>
 #include <signal.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <netdb.h>
 #include <stdio.h>
@@ -73,9 +73,9 @@ static void
 usage(void)
 {
        fprintf(stderr,
-           "usage: %s [-z] [-f file] [-l length] [-p prefix] cmd [args...]\n",
+           "usage: %s [-ez] [-f file] [-l length] [-p prefix] cmd [args...]\n",
            getprogname());
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
 
@@ -84,9 +84,10 @@ main(int argc, char *argv[])
 {
        static char fb_buf[BUFSIZ];
        char *infile = NULL;
-       pid_t pid = 0, gzippid = 0;
-       int ch, fd, outpipe[2], waitstat;
-       int lflag = 0, zflag = 0;
+       pid_t pid = 0, gzippid = 0, deadpid;
+       int ch, fd, outpipe[2];
+       int ws, gzipstat, cmdstat;
+       int eflag = 0, lflag = 0, zflag = 0;
        ssize_t nr, nw, off;
        struct stat statb;
        struct ttysize ts;
@@ -96,16 +97,20 @@ main(int argc, char *argv[])
        /* defaults: Read from stdin, 0 filesize (no completion estimate) */
        fd = STDIN_FILENO;
        filesize = 0;
-       prefix=NULL;
+       prefix = NULL;
 
-       while ((ch = getopt(argc, argv, "f:l:p:z")) != -1)
+       while ((ch = getopt(argc, argv, "ef:l:p:z")) != -1)
                switch (ch) {
+               case 'e':
+                       eflag++;
+                       break;
                case 'f':
                        infile = optarg;
                        break;
                case 'l':
                        lflag++;
-                       filesize = strtoull(optarg, NULL, 0);
+                       filesize = strsuftoll("input size", optarg, 0,
+                           LLONG_MAX);
                        break;
                case 'p':
                        prefix = optarg;
@@ -113,8 +118,8 @@ main(int argc, char *argv[])
                case 'z':
                        zflag++;
                        break;
-               default:
                case '?':
+               default:
                        usage();
                        /* NOTREACHED */
                }
@@ -123,18 +128,26 @@ main(int argc, char *argv[])
 
        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 (!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) {
                FILE *gzipsizepipe;
-               char buf[256], *cmd;
-               long size;
+               char buf[256], *cp, *cmd;
 
                /*
                 * Read second word of last line of gzip -l output. Looks like:
@@ -148,8 +161,8 @@ main(int argc, char *argv[])
                        err(1, "reading compressed file length");
                for (; fgets(buf, 256, gzipsizepipe) != NULL;)
                    continue;
-               sscanf(buf, "%*d %ld", &size);
-               filesize = size;
+               strtoimax(buf, &cp, 10);
+               filesize = strtoimax(cp, NULL, 10);
                if (pclose(gzipsizepipe) < 0)
                        err(1, "closing compressed file length pipe");
                free(cmd);
@@ -182,11 +195,11 @@ main(int argc, char *argv[])
        /* Initialize progressbar.c's global state */
        bytes = 0;
        progress = 1;
-       ttyout = stdout;
+       ttyout = eflag ? stderr : stdout;
 
-       if (ioctl(fileno(ttyout), TIOCGSIZE, &ts) == -1) {
+       if (ioctl(fileno(ttyout), TIOCGSIZE, &ts) == -1)
                ttywidth = 80;
-       } else
+       else
                ttywidth = ts.ts_cols;
 
        if (pipe(outpipe) < 0)
@@ -214,22 +227,33 @@ main(int argc, char *argv[])
                                                        (unsigned) nr);
        close(outpipe[1]);
 
+       gzipstat = 0;
+       cmdstat = 0;
        while (pid || gzippid) {
-               int deadpid;
-
-               deadpid = wait(&waitstat);
+               deadpid = wait(&ws);
+               /*
+                * We need to exit with an error if the command (or gzip)
+                * exited abnormally.
+                * Unfortunately we can't generate a true 'exited by signal'
+                * error without sending the signal to ourselves :-(
+                */
+               ws = WIFSIGNALED(ws) ? WTERMSIG(ws) : WEXITSTATUS(ws);
 
-               if (deadpid == pid)
+               if (deadpid != -1 && errno == EINTR)
+                       continue;
+               if (deadpid == pid) {
                        pid = 0;
-               else if (deadpid == gzippid)
-                       gzippid = 0;
-               else if (deadpid != -1)
+                       cmdstat = ws;
                        continue;
-               else if (errno == EINTR)
+               }
+               if (deadpid == gzippid) {
+                       gzippid = 0;
+                       gzipstat = ws;
                        continue;
-               else break;
+               }
+               break;
        }
 
        progressmeter(1);
-       return 0;
+       exit(cmdstat ? cmdstat : gzipstat);
 }