summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2007-01-18 20:53:36 +0000
committermillert <millert@openbsd.org>2007-01-18 20:53:36 +0000
commit5a1be008658a21d4a1a1e6f695b43961dee0fd5f (patch)
treec641576a9845a2e7a41311b13927fd5f95f773b1
parentimplement -T expire. (diff)
downloadwireguard-openbsd-5a1be008658a21d4a1a1e6f695b43961dee0fd5f.tar.xz
wireguard-openbsd-5a1be008658a21d4a1a1e6f695b43961dee0fd5f.zip
We don't want to use GZIP for compress. Only examine GZIP environment
variable when invoked as gzip, gunzip, gzcat, etc. OK otto@
-rw-r--r--usr.bin/compress/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c
index 98f1a9939eb..82e11fb30c7 100644
--- a/usr.bin/compress/main.c
+++ b/usr.bin/compress/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.67 2006/12/01 08:14:53 otto Exp $ */
+/* $OpenBSD: main.c,v 1.68 2007/01/18 20:53:36 millert 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.67 2006/12/01 08:14:53 otto Exp $";
+static const char main_rcsid[] = "$OpenBSD: main.c,v 1.68 2007/01/18 20:53:36 millert Exp $";
#endif
#include <sys/param.h>
@@ -176,7 +176,7 @@ main(int argc, char *argv[])
strlcpy(suffix, method->suffix, sizeof(suffix));
nargv[0] = NULL;
- if ((p = getenv("GZIP")) != NULL) {
+ if (method == M_DEFLATE && (p = getenv("GZIP")) != NULL) {
char *last;
nargv[0] = *argv++;