Commit Graph

12 Commits

Author SHA1 Message Date
des
ec17f77885 Resolve conflicts. 2006-03-23 14:09:21 +00:00
kientzle
3747e27470 Update zconf.h and gzio.c with changes from ZLib 1.2.1 to ZLib 1.2.2.
These are two of the three files that have non-trivial differences from
the vendor branch.  minigzip.c is the third, but there were no changes
from ZLib 1.2.1 to ZLib 1.2.2 in that file.

The rest of the files I intend to get reverted back to the vendor
branch (with cooperation of cvsadmin@).

PR:		i386/76294
2005-04-24 22:04:34 +00:00
tjr
2368747166 Resolve conflicts. 2004-06-30 23:54:46 +00:00
jmz
1cf4d0f1fd In src/lib/libz/gzio.c the function gzprintf does not check if the
amount of bytes (supposed to be) written by vsnprintf exceeds the
size of the buffer.

PR:		bin/48844
Submitted by:	Peter A Jonsson <pj@ludd.luth.se>
Obtained from:	OpenBSD
MFC after:	1 month
2003-03-14 01:47:01 +00:00
green
7ca574f59c Fix conflicts. 2002-03-11 22:36:26 +00:00
dillon
198df63868 Add huff __FBSDID()s puff to whew! libz 2001-09-30 22:39:00 +00:00
kris
0bec2472fd sprintf -> snprintf 2000-11-26 11:04:45 +00:00
peter
76f0c923fe $Id$ -> $FreeBSD$ 1999-08-28 00:22:10 +00:00
peter
67d696bb62 Merge changes from vendor branch (1.1.1 -> 1.1.3) into mainline. 1999-01-10 09:53:51 +00:00
steve
237ff31c6d Merge conflicts. 1998-02-28 06:08:17 +00:00
jkh
808a36ef65 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
peter
70c83c0586 Initial import of zlib-1.0.4 1996-08-18 17:54:27 +00:00