-/* $NetBSD: progress.c,v 1.3 2003/01/22 03:24:21 christos Exp $ */
+/* $NetBSD: progress.c,v 1.15 2007/06/06 17:49:14 briggs Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.3 2003/01/22 03:24:21 christos Exp $");
+__RCSID("$NetBSD: progress.c,v 1.15 2007/06/06 17:49:14 briggs Exp $");
#endif /* not lint */
#include <sys/types.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 <stdio.h>
usage(void)
{
fprintf(stderr,
- "usage: %s [-z] [-f file] [-l length] 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;
- 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;
+ buffersize = 64 * 1024;
+ prefix = NULL;
- while ((ch = getopt(argc, argv, "f:l: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;
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;
break;
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);
}
/* Pipe input through gzip -dc if -z is given */
if (zflag) {
- pid_t gzippid;
int gzippipe[2];
if (pipe(gzippipe) < 0)
/* Initialize progressbar.c's global state */
bytes = 0;
progress = 1;
- ttyout = stdout;
+ ttyout = eflag ? stderr : stdout;
- if (ioctl(fileno(ttyout), TIOCGSIZE, &ts) == -1) {
- warn("could not get tty window size");
+ 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]);
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)
- err(1, "writing %d bytes to output pipe", nr);
+ err(1, "writing %u bytes to output pipe",
+ (unsigned) nr);
close(outpipe[1]);
- wait(&waitstat);
+ gzipstat = 0;
+ cmdstat = 0;
+ while (pid || gzippid) {
+ 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 != -1 && errno == EINTR)
+ continue;
+ if (deadpid == pid) {
+ pid = 0;
+ cmdstat = ws;
+ continue;
+ }
+ if (deadpid == gzippid) {
+ gzippid = 0;
+ gzipstat = ws;
+ continue;
+ }
+ break;
+ }
progressmeter(1);
- return 0;
+
+ free(fb_buf);
+
+ exit(cmdstat ? cmdstat : gzipstat);
}
git.ckatri.com / bsd-progress.git / blobdiff