diff options
| author | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
| commit | ec17f7788515f838ae8c595748fbd664f1e2f1f1 (patch) | |
| tree | 297104a1ee790469dfe9ff88a857a9836926bccc /lib/libz/minigzip.c | |
| parent | 6d9b0264a175d883795d7a2549ca6f2d9c2a15b7 (diff) | |
| download | FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.zip FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'lib/libz/minigzip.c')
| -rw-r--r-- | lib/libz/minigzip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c index 979fd9f..b29d14a 100644 --- a/lib/libz/minigzip.c +++ b/lib/libz/minigzip.c @@ -1,5 +1,5 @@ /* minigzip.c -- simulate gzip using the zlib compression library - * Copyright (C) 1995-2002 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -22,8 +22,6 @@ __FBSDID("$FreeBSD$"); #ifdef STDC # include <string.h> # include <stdlib.h> -#else - extern void exit OF((int)); #endif #ifdef USE_MMAP @@ -322,6 +320,8 @@ int main(argc, argv) break; argc--, argv++; } + if (outmode[3] == ' ') + outmode[3] = 0; if (argc == 0) { SET_BINARY_MODE(stdin); SET_BINARY_MODE(stdout); |
