Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The hack to keep out deflate.c and related stuff belongs better here, 

because that allows zlib to stay closer to the distributed version.
This commit is contained in:
gwr 1996-09-24 20:40:10 +00:00
parent 6dde563e8f
commit a8791ca150
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
distrib/utils/zcat/Makefile
View File

@ -1,8 +1,10 @@
# $NetBSD: Makefile,v 1.1.1.1 1996/09/12 20:24:00 gwr Exp $
# $NetBSD: Makefile,v 1.2 1996/09/24 20:40:10 gwr Exp $
# Small zcat (i.e. for install media)
#
# Note: gzio.c is compiled here with -DNO_DEFLATE
# to eliminate references to large parts of libz.a
# Note: gzio.c is compiled here so that crunchgen will assume
# the same symbol space for zcat.c and gzio.c which is required
# so that the fake deflate functions in zcat.c will satisfy the
# references to those functions in gzio.c (yes, it's a hack).
PROG= zcat
NOMAN=
@ -10,7 +12,6 @@ SRCS= zcat.c gzio.c
SRCDIR= ${.CURDIR}/../../../lib/libz
CFLAGS+= -D_ZLIB_PRIVATE -I${SRCDIR}
CFLAGS+= -DNO_DEFLATE
DPADD+= ${DESTDIR}/usr/lib/libz.a
LDADD+= -lz

26
distrib/utils/zcat/zcat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zcat.c,v 1.1.1.1 1996/09/12 20:24:00 gwr Exp $ */
/* $NetBSD: zcat.c,v 1.2 1996/09/24 20:40:11 gwr Exp $ */
/* mini zcat.c -- a minimal zcat using the zlib compression library
* Copyright (C) 1995-1996 Jean-loup Gailly.
@ -63,7 +63,7 @@ void gz_uncompress(in, out)
/* ===========================================================================
* Usage: miniunzip [files...]
* Usage: zcat [files...]
*/
int main(argc, argv)
@ -100,3 +100,25 @@ int main(argc, argv)
} while (argv++, --argc);
return 0; /* to avoid warning */
}
/*
* XXX: hacks to keep gzio.c from pulling in deflate stuff
*/
int deflateInit2_ (z_streamp strm, int level, int method,
int windowBits, int memLevel, int strategy,
const char *version, int stream_size)
{
return(-1);
}
int deflate (z_streamp strm, int flush)
{
return(-1);
}
int deflateEnd (z_streamp strm)
{
return(-1);
}