update copyrights

[bsd-progress.git] / progress.c

diff --git a/progress.c b/progress.c
index a598ec3632f0d7b7d5c3c82c2824eb80cc5e25f4..826d240dda2f4f688514e7f56cacdf62ecc8ba1f 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: progress.c,v 1.12 2006/04/20 23:20:55 hubertf Exp $ */
+/*     $NetBSD: progress.c,v 1.17 2008/05/26 04:53:11 dholland 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,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.12 2006/04/20 23:20:55 hubertf Exp $");
+__RCSID("$NetBSD: progress.c,v 1.17 2008/05/26 04:53:11 dholland Exp $");
 #endif                         /* not lint */
 
 #include <sys/types.h>
@@ -46,12 +43,12 @@ __RCSID("$NetBSD: progress.c,v 1.12 2006/04/20 23:20:55 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>
@@ -66,29 +63,40 @@ __RCSID("$NetBSD: progress.c,v 1.12 2006/04/20 23:20:55 hubertf Exp $");
                                 * declared */
 #include "progressbar.h"
 
+static void broken_pipe(int unused);
 static void usage(void);
 int main(int, char *[]);
 
+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());
-       exit(1);
+           "usage: %s [-ez] [-b buffersize] [-f file] [-l length]\n"
+           "       %*.s [-p prefix] cmd [args...]\n",
+           getprogname(), (int) strlen(getprogname()), "");
+       exit(EXIT_FAILURE);
 }
 
 
 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 +105,15 @@ main(int argc, char *argv[])
        /* defaults: Read from stdin, 0 filesize (no completion estimate) */
        fd = STDIN_FILENO;
        filesize = 0;
-       prefix=NULL;
+       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, SIZE_T_MAX);
+                       break;
                case 'e':
                        eflag++;
                        break;
@@ -118,8 +131,8 @@ main(int argc, char *argv[])
                case 'z':
                        zflag++;
                        break;
-               default:
                case '?':
+               default:
                        usage();
                        /* NOTREACHED */
                }
@@ -128,6 +141,7 @@ main(int argc, char *argv[])
 
        if (argc < 1)
                usage();
+
        if (infile && (fd = open(infile, O_RDONLY, 0)) < 0)
                err(1, "%s", infile);
 
@@ -196,11 +210,15 @@ main(int argc, char *argv[])
        progress = 1;
        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;
 
+       fb_buf = malloc(buffersize);
+       if (fb_buf == NULL)
+               err(1, "malloc for buffersize");
+
        if (pipe(outpipe) < 0)
                err(1, "output pipe");
        pid = fork();
@@ -217,13 +235,17 @@ main(int argc, char *argv[])
        }
        close(outpipe[0]);
 
+       signal(SIGPIPE, broken_pipe);
        progressmeter(-1);
-       while ((nr = read(fd, fb_buf, BUFSIZ)) > 0)
+
+       while ((nr = read(fd, fb_buf, buffersize)) > 0)
                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;
@@ -254,5 +276,9 @@ main(int argc, char *argv[])
        }
 
        progressmeter(1);
+       signal(SIGPIPE, SIG_DFL);
+
+       free(fb_buf);
+
        exit(cmdstat ? cmdstat : gzipstat);
 }