OpenBSD CVS

CVS log for src/usr.bin/compress/gzopen.c


[BACK] Up to [local] / src / usr.bin / compress

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.35 / (download) - annotate - [select for diffs], Sat Jun 18 03:23:19 2022 UTC (23 months ago) by gkoehler
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, HEAD
Changes since 1.34: +21 -18 lines
Diff to previous 1.34 (colored)

Fix gzip byte counts with 32-bit integers

If zlib is without our local change in lib/libz/zlib.h r1.7, then
s->z_stream.total_in and s->z_stream.total_out might overflow on
architectures where uLong has 32 bits.  After overflow, the total
would be 4G below the correct total.

Calculate our own 64-bit totals.  When decompressing, take
(uLong)s->z_stream.total_in as a total modulo ULONG_MAX + 1.

ok tb@

Revision 1.34 / (download) - annotate - [select for diffs], Sat Sep 3 12:29:30 2016 UTC (7 years, 8 months ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.33: +185 -194 lines
Diff to previous 1.33 (colored)

the SMALL code made a half hearted effort to exclude compression code
but some of the write code remained. shuffle things around a bit to make
the exclusion more complete.

Revision 1.33 / (download) - annotate - [select for diffs], Sat Sep 3 11:41:10 2016 UTC (7 years, 8 months ago) by tedu
Branch: MAIN
Changes since 1.32: +62 -35 lines
Diff to previous 1.32 (colored)

start pulling apart some function pointers that take too many parameters
because of excessive code sharing. compression and decompression are not
entirely similar, they should share less.
ok joerg millert

Revision 1.32 / (download) - annotate - [select for diffs], Wed Aug 17 12:02:38 2016 UTC (7 years, 9 months ago) by millert
Branch: MAIN
Changes since 1.31: +9 -5 lines
Diff to previous 1.31 (colored)

When returning the file size info, only use z_total_in/z_total_out
for the read (inflate) case where there might be multiple streams.
For the write (deflate) case there can only be a single stream so
just use the per-stream total_in/total_out.  Fixes "gzip -v" byte
counts.  OK henning@.

Revision 1.31 / (download) - annotate - [select for diffs], Fri Apr 29 13:50:35 2016 UTC (8 years ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.30: +3 -1 lines
Diff to previous 1.30 (colored)

Need to set in/out bytes count for gz_write too.  Otherwise gzip
will think the resulting file was got larger during compression.

Revision 1.30 / (download) - annotate - [select for diffs], Thu Apr 28 14:21:24 2016 UTC (8 years ago) by millert
Branch: MAIN
Changes since 1.29: +24 -11 lines
Diff to previous 1.29 (colored)

Account for multiple streams in "gzip -l" output.  This fixes "gzip
-l" output when used on package files.  OK espie@ deraadt@

Revision 1.29 / (download) - annotate - [select for diffs], Thu Aug 20 22:32:41 2015 UTC (8 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.28: +2 -2 lines
Diff to previous 1.28 (colored)

Do not cast result of malloc/calloc/realloc* if stdlib.h is in scope
ok krw millert

Revision 1.28 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:06 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.27: +3 -3 lines
Diff to previous 1.27 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.27 / (download) - annotate - [select for diffs], Thu Sep 22 10:41:04 2011 UTC (12 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.26: +1 -6 lines
Diff to previous 1.26 (colored)

Remove the rcsid which were intentionally skipped in the "purge of 2009"
because the -V command printed them... gut the -V (and -L, while there)
to be silent.
ok miod jsg

Revision 1.26 / (download) - annotate - [select for diffs], Wed Nov 11 18:04:35 2009 UTC (14 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.25: +3 -2 lines
Diff to previous 1.25 (colored)

memory leak with #ifdef SMALL, found by parfait
ok jsg

Revision 1.25 / (download) - annotate - [select for diffs], Wed Aug 20 09:22:02 2008 UTC (15 years, 9 months ago) by mpf
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.24: +11 -2 lines
Diff to previous 1.24 (colored)

Use and report errors that inflate(3) can return, instead of
aborting silently, and pretending everything went alright.
This lets gzip(1) (especially gzip -t) detect truncated archives
and curruptions that violate the structure of the zlib format.
Unquiet compress(1) in zless/zmore, so the user has a chance
to see errors on corrupted archives.
OK millert@, markus@

Revision 1.24 / (download) - annotate - [select for diffs], Mon Mar 19 13:02:18 2007 UTC (17 years, 2 months ago) by pedro
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.23: +6 -5 lines
Diff to previous 1.23 (colored)

Fix check for failed read, and add another one; okay millert@

Revision 1.23 / (download) - annotate - [select for diffs], Sun Jun 26 18:20:26 2005 UTC (18 years, 10 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.22: +6 -5 lines
Diff to previous 1.22 (colored)

be a bit more carefull not writing to the stream after the timestamps
have been set. ok deraadt@

Revision 1.22 / (download) - annotate - [select for diffs], Mon Sep 6 21:24:11 2004 UTC (19 years, 8 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.21: +6 -6 lines
Diff to previous 1.21 (colored)

set the xflags; form netbsd; millert@ deraadt@ otto@ ok

Revision 1.21 / (download) - annotate - [select for diffs], Mon Feb 23 21:07:30 2004 UTC (20 years, 2 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)

knf

Revision 1.20 / (download) - annotate - [select for diffs], Tue Dec 16 23:25:02 2003 UTC (20 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.19: +16 -3 lines
Diff to previous 1.19 (colored)

really don't implement unzip #ifdef SMALL
this was in the tested diffs but slipped through when committing unfortunately,
sorry

Revision 1.19 / (download) - annotate - [select for diffs], Tue Dec 16 22:46:25 2003 UTC (20 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.18: +4 -2 lines
Diff to previous 1.18 (colored)

do not include rcsids with -DSMALL and as it is meaningless then do not
implement -V then. following a discussion with millert@

Revision 1.18 / (download) - annotate - [select for diffs], Tue Dec 16 22:38:40 2003 UTC (20 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)

when we read the original file size from the gzp header in uncompress mode
and compare it to total_out to detect I/O errors we need to cast total_out
to u_int32_t as the gzip header file is limited to that and total_out is now
64 bits.
ok millert@

Revision 1.17 / (download) - annotate - [select for diffs], Tue Dec 9 07:34:55 2003 UTC (20 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.16: +7 -4 lines
Diff to previous 1.16 (colored)

Fixes based on a patch from Moritz Jodeit; mickey@ OK
o break out of inflate() when we hit an error
o fix printf format #ifdef SMALL
o add version string of nullopen.c to -V output
o remove unnecessary initializations to 0 for variables cat and decomp
o beautify -l output to make it line up with the heading

Revision 1.16 / (download) - annotate - [select for diffs], Fri Nov 21 21:54:46 2003 UTC (20 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.15: +9 -17 lines
Diff to previous 1.15 (colored)

Simplified support for concatenated files; similar to what zlib does.
mickey@ OK

Revision 1.15 / (download) - annotate - [select for diffs], Fri Nov 14 22:29:53 2003 UTC (20 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.14: +17 -3 lines
Diff to previous 1.14 (colored)

Add support for inflating multiple concatenated file like GNU gzip does.
Problem noticed by lebel@, OK mickey@

Revision 1.14 / (download) - annotate - [select for diffs], Thu Jul 17 20:17:02 2003 UTC (20 years, 10 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

two calls is less than a loop for two; millert@ ok

Revision 1.13 / (download) - annotate - [select for diffs], Thu Jul 17 20:06:01 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.12: +94 -31 lines
Diff to previous 1.12 (colored)

o implement -l, -n and -N (including setting outfile + mtime)
o make -v behave like GNU gzip for compress/decompress stats
o write a full gzip header w/ mtime and file name
o for -t/-l just don't write data instead of writing to /dev/null
o exit code is now more consistent with GNU gzip
o a crc error on decompress no longer causes unlink(outfile)
mickey@ OK

Revision 1.12 / (download) - annotate - [select for diffs], Fri Jul 11 02:31:18 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.11: +13 -26 lines
Diff to previous 1.11 (colored)

Move magic number checking into main.c and make it work when
decompressing from a pipe.  Currently assumes that magic numbers
are 2 bytes but this is relatively easy to change as needed in the
future.  Discussed w/ mickey@

Revision 1.11 / (download) - annotate - [select for diffs], Thu Jul 10 00:06:50 2003 UTC (20 years, 10 months ago) by david
Branch: MAIN
Changes since 1.10: +3 -2 lines
Diff to previous 1.10 (colored)

add missing includes
ok deraadt@ tedu@

Revision 1.10 / (download) - annotate - [select for diffs], Tue Jul 8 00:30:12 2003 UTC (20 years, 10 months ago) by mickey
Branch: MAIN
Changes since 1.9: +7 -2 lines
Diff to previous 1.9 (colored)

fix fd closing logicand close in gzopen(); found by wilfried@ and millert@ ok

Revision 1.9 / (download) - annotate - [select for diffs], Sun Jun 29 21:14:37 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.8: +7 -4 lines
Diff to previous 1.8 (colored)

Return EINVAL on crc failure for gzip and make the driver program
interpret this correctly.  Makes "gzip -t" more useful.  Discussed
with deraadt@

Revision 1.8 / (download) - annotate - [select for diffs], Fri Jun 27 19:29:45 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.7: +5 -12 lines
Diff to previous 1.7 (colored)

Fix bug in put_int32() on big endian cpus; deraadt@ OK

Revision 1.7 / (download) - annotate - [select for diffs], Sun Jun 22 15:22:43 2003 UTC (20 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.6: +17 -39 lines
Diff to previous 1.6 (colored)

knf and ansi

Revision 1.6 / (download) - annotate - [select for diffs], Tue Jun 3 21:08:36 2003 UTC (20 years, 11 months ago) by mickey
Branch: MAIN
Changes since 1.5: +2 -7 lines
Diff to previous 1.5 (colored)

three four kills

Revision 1.5 / (download) - annotate - [select for diffs], Sun Dec 8 16:07:54 2002 UTC (21 years, 5 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.4: +9 -6 lines
Diff to previous 1.4 (colored)

grop long option names, like gzip.
add most of the gzip's options (a few unimplemented yet).
some cleaning, etc.
millert@ ok

Revision 1.4 / (download) - annotate - [select for diffs], Mon Aug 12 00:42:56 2002 UTC (21 years, 9 months ago) by aaron
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)

Swap args to calloc(3) so they are in the correct order; art@ ok.

Revision 1.3 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:45 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.2: +5 -5 lines
Diff to previous 1.2 (colored)

Part one of userland __P removal.  Done with a simple regexp with some minor hand editing to make comments line up correctly.  Another pass is forthcoming that handles the cases that could not be done automatically.

Revision 1.2 / (download) - annotate - [select for diffs], Mon Nov 19 19:02:13 2001 UTC (22 years, 6 months ago) by mpech
Branch: MAIN
Changes since 1.1: +14 -14 lines
Diff to previous 1.1 (colored)

kill more registers

millert@ ok

Revision 1.1 / (download) - annotate - [select for diffs], Sun Jul 6 20:22:57 1997 UTC (26 years, 10 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0, OPENBSD_2_9_BASE, OPENBSD_2_9, OPENBSD_2_8_BASE, OPENBSD_2_8, OPENBSD_2_7_BASE, OPENBSD_2_7, OPENBSD_2_6_BASE, OPENBSD_2_6, OPENBSD_2_5_BASE, OPENBSD_2_5, OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3, OPENBSD_2_2_BASE, OPENBSD_2_2

do gzip

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.