SOURCES: gzip-rsyncable.patch - never version of that patch
blues
blues at pld-linux.org
Tue Jun 13 23:03:55 CEST 2006
Author: blues Date: Tue Jun 13 21:03:55 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- never version of that patch
---- Files affected:
SOURCES:
gzip-rsyncable.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/gzip-rsyncable.patch
diff -u SOURCES/gzip-rsyncable.patch:1.1 SOURCES/gzip-rsyncable.patch:1.2
--- SOURCES/gzip-rsyncable.patch:1.1 Tue Jun 13 22:51:14 2006
+++ SOURCES/gzip-rsyncable.patch Tue Jun 13 23:03:50 2006
@@ -1,22 +1,27 @@
-diff -ur gzip-1.2.4.debian/deflate.c gzip-1.2.4-working/deflate.c
---- gzip-1.2.4.debian/deflate.c Fri Aug 13 22:35:31 1993
-+++ gzip-1.2.4-working/deflate.c Wed Oct 18 18:03:04 2000
-@@ -121,6 +121,14 @@
+NOTE: this patch is for _gzip_!
+
+This is pending for actual inclusion in gzip. It is currently being
+tried out in the default gzip for Debian Sarge, and may go into the
+upstream gzip at somepoint in the not-too-distant future.
+
+--- gzip-1.3.5/deflate.c 1999-10-07 23:46:28 -0700
++++ rsyncable/deflate.c 2005-02-05 09:40:33 -0800
+@@ -122,6 +122,14 @@
#endif
/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+#ifndef RSYNC_WIN
-+# define RSYNC_WIN 8192
++# define RSYNC_WIN 4096
+#endif
+/* Size of rsync window, must be < MAX_DIST */
+
-+#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0)
++#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
+/* Whether window sum matches magic value */
+
/* ===========================================================================
* Local data used by the "longest match" routines.
*/
-@@ -202,6 +210,8 @@
+@@ -203,6 +211,8 @@
unsigned near good_match;
/* Use a faster search when the previous match is longer than this */
@@ -25,7 +30,7 @@
/* Values for max_lazy_match, good_match and max_chain_length, depending on
* the desired pack level (0..9). The values given below have been tuned to
-@@ -300,6 +310,10 @@
+@@ -301,6 +311,10 @@
#endif
/* prev will be initialized on the fly */
@@ -36,15 +41,7 @@
/* Set the default configuration parameters:
*/
max_lazy_match = configuration_table[pack_level].max_lazy;
-@@ -317,6 +331,7 @@
-
- strstart = 0;
- block_start = 0L;
-+ rsync_chunk_end = 0xFFFFFFFFUL;
- #ifdef ASMV
- match_init(); /* initialize the asm code */
- #endif
-@@ -536,6 +551,8 @@
+@@ -537,6 +551,8 @@
memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
match_start -= WSIZE;
strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */
@@ -53,7 +50,7 @@
block_start -= (long) WSIZE;
-@@ -563,6 +580,39 @@
+@@ -564,13 +580,46 @@
}
}
@@ -93,7 +90,24 @@
/* ===========================================================================
* Flush the current block, with given end-of-file flag.
* IN assertion: strstart is set to the end of the current match.
-@@ -609,6 +659,7 @@
+ */
+ #define FLUSH_BLOCK(eof) \
+ flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
+- (char*)NULL, (long)strstart - block_start, (eof))
++ (char*)NULL, (long)strstart - block_start, flush-1, (eof))
+
+ /* ===========================================================================
+ * Processes a new input file and return its compressed length. This
+@@ -581,7 +630,7 @@
+ local off_t deflate_fast()
+ {
+ IPos hash_head; /* head of the hash chain */
+- int flush; /* set if current block must be flushed */
++ int flush; /* set if current block must be flushed, 2=>and padded */
+ unsigned match_length = 0; /* length of best match */
+
+ prev_length = MIN_MATCH-1;
+@@ -610,6 +659,7 @@
lookahead -= match_length;
@@ -101,7 +115,7 @@
/* Insert new strings in the hash table only if the match length
* is not too large. This saves time but degrades compression.
*/
-@@ -637,9 +688,18 @@
+@@ -638,9 +688,14 @@
/* No match, output a literal byte */
Tracevv((stderr,"%c",window[strstart]));
flush = ct_tally (0, window[strstart]);
@@ -110,17 +124,13 @@
strstart++;
}
+ if (rsync && strstart > rsync_chunk_end) {
-+ ush attr = 0; /* ascii/binary flag */
-+
-+ flush = 1;
-+ /* Reset huffman tree */
-+ ct_init(&attr, &method);
+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ }
++ flush = 2;
++ }
if (flush) FLUSH_BLOCK(0), block_start = strstart;
/* Make sure that we always have enough lookahead, except
-@@ -715,6 +775,7 @@
+@@ -713,6 +768,7 @@
*/
lookahead -= prev_length-1;
prev_length -= 2;
@@ -128,19 +138,15 @@
do {
strstart++;
INSERT_STRING(strstart, hash_head);
-@@ -727,24 +788,51 @@
+@@ -725,24 +781,39 @@
match_available = 0;
match_length = MIN_MATCH-1;
strstart++;
- if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ if (rsync && strstart > rsync_chunk_end) {
-+ ush attr = 0; /* ascii/binary flag */
-+
-+ /* Reset huffman tree */
-+ ct_init(&attr, &method);
+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 1;
++ flush = 2;
+ }
+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
} else if (match_available) {
@@ -154,13 +160,8 @@
- }
+ flush = ct_tally (0, window[strstart-1]);
+ if (rsync && strstart > rsync_chunk_end) {
-+ ush attr = 0; /* ascii/binary flag */
-+
-+ /* Reset huffman tree */
-+ ct_init(&attr, &method);
+ rsync_chunk_end = 0xFFFFFFFFUL;
-+
-+ flush = 1;
++ flush = 2;
+ }
+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ RSYNC_ROLL(strstart, 1);
@@ -171,12 +172,9 @@
* the next step to decide.
*/
+ if (rsync && strstart > rsync_chunk_end) {
-+ ush attr = 0; /* ascii/binary flag */
-+
+ /* Reset huffman tree */
-+ ct_init(&attr, &method);
+ rsync_chunk_end = 0xFFFFFFFFUL;
-+
++ flush = 2;
+ FLUSH_BLOCK(0), block_start = strstart;
+ }
match_available = 1;
@@ -184,10 +182,9 @@
strstart++;
lookahead--;
}
-diff -ur gzip-1.2.4.debian/gzip.c gzip-1.2.4-working/gzip.c
---- gzip-1.2.4.debian/gzip.c Wed Oct 18 16:05:08 2000
-+++ gzip-1.2.4-working/gzip.c Wed Oct 18 15:42:59 2000
-@@ -239,6 +239,7 @@
+--- gzip-1.3.5/gzip.c 2002-09-28 00:38:43 -0700
++++ rsyncable/gzip.c 2005-02-05 09:40:33 -0800
+@@ -256,6 +256,7 @@
unsigned insize; /* valid bytes in inbuf */
unsigned inptr; /* index of next byte to be processed in inbuf */
unsigned outcnt; /* bytes in output buffer */
@@ -195,7 +192,7 @@
struct option longopts[] =
{
-@@ -268,6 +269,7 @@
+@@ -285,6 +286,7 @@
{"best", 0, 0, '9'}, /* compress better */
{"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */
{"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */
@@ -203,15 +200,15 @@
{ 0, 0, 0, 0 }
};
-@@ -357,6 +359,7 @@
+@@ -365,6 +367,7 @@
" -Z --lzw produce output compatible with old compress",
" -b --bits maxbits max number of bits per code (implies -Z)",
#endif
+ " --rsyncable Make rsync-friendly archive",
" file... files to (de)compress. If none given, use standard input.",
+ "Report bugs to <bug-gzip at gnu.org>.",
0};
- char **p = help_msg;
-@@ -516,6 +519,9 @@
+@@ -543,6 +546,9 @@
#else
recursive = 1; break;
#endif
@@ -221,27 +218,34 @@
case 'S':
#ifdef NO_MULTIPLE_DOTS
if (*optarg == '.') optarg++;
-diff -ur gzip-1.2.4.debian/gzip.h gzip-1.2.4-working/gzip.h
---- gzip-1.2.4.debian/gzip.h Wed Oct 18 16:05:08 2000
-+++ gzip-1.2.4-working/gzip.h Wed Oct 18 17:57:48 2000
-@@ -131,6 +131,7 @@
+--- gzip-1.3.5/gzip.h 2001-09-30 23:53:41 -0700
++++ rsyncable/gzip.h 2005-02-05 09:40:33 -0800
+@@ -133,6 +133,7 @@
extern unsigned insize; /* valid bytes in inbuf */
extern unsigned inptr; /* index of next byte to be processed in inbuf */
extern unsigned outcnt; /* bytes in output buffer */
+extern int rsync; /* deflate into rsyncable chunks */
- extern long bytes_in; /* number of input bytes */
- extern long bytes_out; /* number of output bytes */
-diff -ur gzip-1.2.4.debian/gzip.texi gzip-1.2.4-working/gzip.texi
---- gzip-1.2.4.debian/gzip.texi Thu Aug 19 06:42:50 1993
-+++ gzip-1.2.4-working/gzip.texi Wed Oct 18 16:58:05 2000
-@@ -316,6 +316,14 @@
+ extern off_t bytes_in; /* number of input bytes */
+ extern off_t bytes_out; /* number of output bytes */
+@@ -281,7 +282,7 @@
+ /* in trees.c */
+ void ct_init OF((ush *attr, int *method));
+ int ct_tally OF((int dist, int lc));
+-off_t flush_block OF((char *buf, ulg stored_len, int eof));
++off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof));
+
+ /* in bits.c */
+ void bi_init OF((file_t zipfile));
+--- gzip-1.3.5/gzip.texi 2002-09-29 23:57:29 -0700
++++ rsyncable/gzip.texi 2005-02-05 09:40:33 -0800
+@@ -334,6 +334,14 @@
into the directory and compress all the files it finds there (or
decompress them in the case of @code{gunzip}).
+ at item --rsyncable
+While compressing, synchronize the output occasionally based on the
-+input. This can reduce the compression slightly in some cases, but
++input. This increases size by less than 1 percent most cases, but
+means that the @code{rsync} program can take advantage of similarities
+in the uncompressed input when syncronizing two files compressed with
+this flag. @code{gunzip} cannot tell the difference between a
@@ -250,3 +254,46 @@
@item --suffix @var{suf}
@itemx -S @var{suf}
Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
+--- gzip-1.3.5/trees.c 1999-10-05 22:00:00 -0700
++++ rsyncable/trees.c 2005-02-05 09:40:33 -0800
+@@ -46,12 +46,13 @@
+ * void ct_tally (int dist, int lc);
+ * Save the match info and tally the frequency counts.
+ *
+- * off_t flush_block (char *buf, ulg stored_len, int eof)
++ * off_t flush_block (char *buf, ulg stored_len, int pad, int eof)
+ * Determine the best encoding for the current block: dynamic trees,
+ * static trees or store, and output the encoded block to the zip
+- * file. Returns the total compressed length for the file so far.
+- *
+- */
++ * file. If pad is set, pads the block to the next
++ * byte. Returns the total compressed length for the file so
++ * far.
++ * */
+
+ #include <config.h>
+ #include <ctype.h>
+@@ -847,9 +848,10 @@
+ * trees or store, and output the encoded block to the zip file. This function
+ * returns the total compressed length for the file so far.
+ */
+-off_t flush_block(buf, stored_len, eof)
++off_t flush_block(buf, stored_len, pad, eof)
+ char *buf; /* input block, or NULL if too old */
+ ulg stored_len; /* length of input block */
++ int pad; /* pad output to byte boundary */
+ int eof; /* true if this is the last block for a file */
+ {
+ ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+@@ -941,6 +943,10 @@
+ Assert (input_len == bytes_in, "bad input size");
+ bi_windup();
+ compressed_len += 7; /* align on byte boundary */
++ } else if (pad && (compressed_len % 8) != 0) {
++ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */
++ compressed_len = (compressed_len + 3 + 7) & ~7L;
++ copy_block(buf, 0, 1); /* with header */
+ }
+
+ return compressed_len >> 3;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/gzip-rsyncable.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list