updatre with latest from tzcode.

[bsd-progress.git] / progress.c

diff --git a/progress.c b/progress.c
index 79076f9eaa4ca1c6266af46eead93ee7283df62a..16886875f3fbf94d6632fafee5162c74607886ec 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: progress.c,v 1.14 2007/02/07 15:21:21 hubertf Exp $ */
+/*     $NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,9 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -34,47 +31,47 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.14 2007/02/07 15:21:21 hubertf Exp $");
+__RCSID("$NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $");
 #endif                         /* not lint */
 
 #include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
-#include <netinet/in.h>
-#include <arpa/ftp.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 <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
-#include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 
 #define GLOBAL                 /* force GLOBAL decls in progressbar.h to be
                                 * declared */
 #include "progressbar.h"
 
-static void usage(void);
-int main(int, char *[]);
+static void broken_pipe(int unused);
+__dead static void usage(void);
+
+static void
+broken_pipe(int unused)
+{
+       signal(SIGPIPE, SIG_DFL);
+       progressmeter(1);
+       kill(getpid(), SIGPIPE);
+}
 
 static void
 usage(void)
 {
        fprintf(stderr,
-           "usage: %s [-ez] [-f file] [-l length] [-p prefix] cmd [args...]\n",
-           getprogname());
+           "usage: %s [-ez] [-b buffersize] [-f file] [-l length]\n"
+           "       %*.s [-p prefix] cmd [args...]\n",
+           getprogname(), (int) strlen(getprogname()), "");
        exit(EXIT_FAILURE);
 }
 
@@ -82,13 +79,14 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-       static char fb_buf[BUFSIZ];
+       char *fb_buf;
        char *infile = NULL;
        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;
+       size_t buffersize;
        struct stat statb;
        struct ttysize ts;
 
@@ -97,10 +95,15 @@ main(int argc, char *argv[])
        /* defaults: Read from stdin, 0 filesize (no completion estimate) */
        fd = STDIN_FILENO;
        filesize = 0;
+       buffersize = 64 * 1024;
        prefix = NULL;
 
-       while ((ch = getopt(argc, argv, "ef:l:p:z")) != -1)
+       while ((ch = getopt(argc, argv, "b:ef:l:p:z")) != -1)
                switch (ch) {
+               case 'b':
+                       buffersize = (size_t) strsuftoll("buffer size", optarg,
+                           0, SSIZE_MAX);
+                       break;
                case 'e':
                        eflag++;
                        break;
@@ -202,6 +205,10 @@ main(int argc, char *argv[])
        else
                ttywidth = ts.ts_cols;
 
+       fb_buf = malloc(buffersize);
+       if (fb_buf == NULL)
+               err(1, "malloc for buffersize");
+
        if (pipe(outpipe) < 0)
                err(1, "output pipe");
        pid = fork();
@@ -218,13 +225,23 @@ main(int argc, char *argv[])
        }
        close(outpipe[0]);
 
+       signal(SIGPIPE, broken_pipe);
        progressmeter(-1);
-       while ((nr = read(fd, fb_buf, BUFSIZ)) > 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)
+                           (size_t) nr)) < 0) {
+                               progressmeter(1);
                                err(1, "writing %u bytes to output pipe",
                                                        (unsigned) nr);
+                       }
+       }
        close(outpipe[1]);
 
        gzipstat = 0;
@@ -255,5 +272,9 @@ main(int argc, char *argv[])
        }
 
        progressmeter(1);
+       signal(SIGPIPE, SIG_DFL);
+
+       free(fb_buf);
+
        exit(cmdstat ? cmdstat : gzipstat);
 }