summaryrefslogtreecommitdiff
path: root/usr.bin/compress
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-07-18 20:43:19 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-07-18 20:43:19 +0000
commitfbf1bb4de62021a3407bb358b992def18b98bfde (patch)
tree7236cf6568131f34139b5bde10aaa1259bfbabd4 /usr.bin/compress
parent24b9c38dd992faf8e070ceb88e270a35213404f8 (diff)
Change "nosave" back into a boolean for improved grokability.
It is now initialized to -1 and, if the user did not specify the -n or -N flags, is set equal to "decomp". In other words, unless overridden via -n/-N, it is false when compressing, and true when decompressing (which is what we want).
Diffstat (limited to 'usr.bin/compress')
-rw-r--r--usr.bin/compress/main.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c
index 94208b39b97..8541d8b8124 100644
--- a/usr.bin/compress/main.c
+++ b/usr.bin/compress/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.37 2003/07/17 20:06:01 millert Exp $ */
+/* $OpenBSD: main.c,v 1.38 2003/07/18 20:43:18 millert Exp $ */
static const char copyright[] =
"@(#) Copyright (c) 1992, 1993\n\
@@ -35,7 +35,7 @@ static const char license[] =
#if 0
static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94";
#else
-static const char main_rcsid[] = "$OpenBSD: main.c,v 1.37 2003/07/17 20:06:01 millert Exp $";
+static const char main_rcsid[] = "$OpenBSD: main.c,v 1.38 2003/07/18 20:43:18 millert Exp $";
#endif
#endif /* not lint */
@@ -138,6 +138,7 @@ main(int argc, char *argv[])
int bits, exists, oreg, ch, error, i, rc, oflag;
bits = cat = oflag = decomp = 0;
+ nosave = -1;
p = __progname;
if (p[0] == 'g') {
method = M_DEFLATE;
@@ -232,7 +233,7 @@ main(int argc, char *argv[])
nosave = 1;
break;
case 'N':
- nosave = -1;
+ nosave = 0;
break;
case 'O':
method = M_COMPRESS;
@@ -304,6 +305,8 @@ main(int argc, char *argv[])
if ((cat && argc) + testmode + oflag > 1)
errx(1, "may not mix -o, -c, or -t options");
+ if (nosave == -1)
+ nosave = decomp;
if ((ftsp = fts_open(argv, FTS_PHYSICAL|FTS_NOCHDIR, 0)) == NULL)
err(1, NULL);
@@ -461,7 +464,7 @@ compress(const char *in, char *out, const struct compressor *method,
return (FAILURE);
}
- if (!pipin && nosave <= 0) {
+ if (!pipin && !nosave) {
name = basename(in);
mtime = (u_int32_t)sb->st_mtime;
}
@@ -562,7 +565,7 @@ decompress(const char *in, char *out, const struct compressor *method,
}
/* XXX - open constrains outfile to MAXPATHLEN so this is safe */
- if ((cookie = (*method->open)(ifd, "r", nosave < 0 ? out : NULL,
+ if ((cookie = (*method->open)(ifd, "r", nosave ? NULL : out,
bits, 0, 1)) == NULL) {
if (verbose >= 0)
warn("%s", in);
@@ -601,7 +604,7 @@ decompress(const char *in, char *out, const struct compressor *method,
error = FAILURE;
}
- if (nosave < 0) {
+ if (!nosave) {
sb->st_mtimespec.tv_sec = info.mtime;
sb->st_mtimespec.tv_nsec = 0;
}