diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-08 03:13:20 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-07-08 03:13:20 +0000 |
| commit | bdbb983fefd9a4c1a07a4fcb8edb0ea6516ee09c (patch) | |
| tree | 0cdb5499530ef1a2a43c74d4e8c0293d8acda7b3 /usr.bin | |
| parent | 3894ea7a5f00ed270c4e2361c198e057240d330a (diff) | |
restore compress to terminal
fix faild outfile unlink
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/compress/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c index 1468688a90b..dafb705a561 100644 --- a/usr.bin/compress/main.c +++ b/usr.bin/compress/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.3 1997/07/06 22:03:34 mickey Exp $ */ +/* $OpenBSD: main.c,v 1.4 1997/07/08 03:13:19 mickey Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.3 1997/07/06 22:03:34 mickey Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.4 1997/07/08 03:13:19 mickey Exp $"; #endif #endif /* not lint */ @@ -278,7 +278,7 @@ main(argc, argv) } } - if (error && isreg && unlink(outfile) && verbose >= 0) + if (error && oreg && unlink(outfile) && verbose >= 0) warn("%s", outfile); else if (!error && verbose > 0) fputs("OK\n", stderr); @@ -315,7 +315,7 @@ compress(in, out, method, bits) return -1; } - if (!force && isatty(ofd)) { + if (method != M_COMPRESS && !force && isatty(ofd)) { if (verbose >= 0) warnx("%s: won't write compressed data to terminal", out); |