-/* $NetBSD: progress.c,v 1.8 2004/03/09 17:04:24 hubertf Exp $ */
+/* $NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* 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
#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.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 <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 <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 [-z] [-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;
- 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;
+ size_t buffersize;
struct stat statb;
struct ttysize ts;
/* 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, "f: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;
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;
case 'z':
zflag++;
break;
- default:
case '?':
+ default:
usage();
/* NOTREACHED */
}
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:
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);
/* 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;
+ fb_buf = malloc(buffersize);
+ if (fb_buf == NULL)
+ err(1, "malloc for buffersize");
+
if (pipe(outpipe) < 0)
err(1, "output pipe");
pid = fork();
}
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;
+ 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;
+ signal(SIGPIPE, SIG_DFL);
+
+ free(fb_buf);
+
+ exit(cmdstat ? cmdstat : gzipstat);
}
git.ckatri.com / bsd-progress.git / blobdiff