diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-17 16:17:40 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-17 16:17:40 +0000 |
| commit | 6b0b18cad7de70d563398d1df15317c3c5f88445 (patch) | |
| tree | e01901296fd58bf43519427e0ec2861bdc86de71 /usr.bin | |
| parent | 5d625d52752063a162b9529b504a99894a4c8f8c (diff) | |
spacing
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/compress/main.c | 9 | ||||
| -rw-r--r-- | usr.bin/compress/zopen.c | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c index 418a18f9696..920714afcc1 100644 --- a/usr.bin/compress/main.c +++ b/usr.bin/compress/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.61 2005/04/17 16:07:16 hshoexer Exp $ */ +/* $OpenBSD: main.c,v 1.62 2005/04/17 16:17:39 deraadt Exp $ */ #ifndef SMALL static const char copyright[] = @@ -36,7 +36,7 @@ static const char license[] = #endif /* SMALL */ #ifndef SMALL -static const char main_rcsid[] = "$OpenBSD: main.c,v 1.61 2005/04/17 16:07:16 hshoexer Exp $"; +static const char main_rcsid[] = "$OpenBSD: main.c,v 1.62 2005/04/17 16:17:39 deraadt Exp $"; #endif #include <sys/param.h> @@ -186,9 +186,8 @@ main(int argc, char *argv[]) (p = strtok_r(NULL, " ", &last)), i++) if (i < sizeof(nargv)/sizeof(nargv[1]) - argc - 1) nargv[i] = p; - else { + else errx(1, "GZIP is too long"); - } argc += i - 1; while ((nargv[i++] = *argv++)) ; @@ -819,7 +818,7 @@ list_stats(const char *name, const struct compressor *method, if (timestr[4] == ' ') timestr[4] = '0'; printf("%-7.7s %08x %s ", method->name, info->crc, - timestr); + timestr); } printf("%10lld %10lld %4.1f%% %s\n", (long long)(info->total_in + info->hlen), diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index d1a94da9cdb..2f29874b849 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zopen.c,v 1.14 2003/08/03 01:26:46 deraadt Exp $ */ +/* $OpenBSD: zopen.c,v 1.15 2005/04/17 16:17:39 deraadt Exp $ */ /* $NetBSD: zopen.c,v 1.5 1995/03/26 09:44:53 glass Exp $ */ /*- @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93"; #else const char z_rcsid[] = - "$OpenBSD: zopen.c,v 1.14 2003/08/03 01:26:46 deraadt Exp $"; + "$OpenBSD: zopen.c,v 1.15 2005/04/17 16:17:39 deraadt Exp $"; #endif /*- @@ -433,7 +433,7 @@ output(struct s_zstate *zs, code_int ocode) zs->zs_maxcode = zs->zs_maxmaxcode; else zs->zs_maxcode = - MAXCODE(zs->zs_n_bits); + MAXCODE(zs->zs_n_bits); } } @@ -624,7 +624,7 @@ getcode(struct s_zstate *zs) for (bp = zs->zs_buf; zs->zs_bp < zs->zs_ebp; *bp++ = *zs->zs_bp++); if ((bits = read(zs->zs_fd, bp, ZBUFSIZ - - (bp - zs->zs_buf))) < 0) + (bp - zs->zs_buf))) < 0) return -1; zs->zs_in_count += bits; zs->zs_bp = zs->zs_buf; |