|
Ivana Varekova |
39397c8 |
--- gzip-1.3.9/gzip.c.pom 2007-01-15 14:32:26.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
+++ gzip-1.3.9/gzip.c 2007-01-15 14:54:08.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
@@ -238,6 +238,7 @@
|
|
Ivana Varekova |
39397c8 |
unsigned insize; /* valid bytes in inbuf */
|
|
Ivana Varekova |
39397c8 |
unsigned inptr; /* index of next byte to be processed in inbuf */
|
|
Ivana Varekova |
39397c8 |
unsigned outcnt; /* bytes in output buffer */
|
|
Ivana Varekova |
39397c8 |
+int rsync = 0; /* make ryncable chunks */
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
struct option longopts[] =
|
|
Ivana Varekova |
39397c8 |
{
|
|
Ivana Varekova |
39397c8 |
@@ -267,6 +268,7 @@
|
|
Ivana Varekova |
39397c8 |
{"best", 0, 0, '9'}, /* compress better */
|
|
Ivana Varekova |
39397c8 |
{"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */
|
|
Ivana Varekova |
39397c8 |
{"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */
|
|
Ivana Varekova |
39397c8 |
+ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */
|
|
Ivana Varekova |
39397c8 |
{ 0, 0, 0, 0 }
|
|
Ivana Varekova |
39397c8 |
};
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
@@ -348,6 +350,7 @@
|
|
Ivana Varekova |
39397c8 |
" -Z, --lzw produce output compatible with old compress",
|
|
Ivana Varekova |
39397c8 |
" -b, --bits=BITS max number of bits per code (implies -Z)",
|
|
Ivana Varekova |
39397c8 |
#endif
|
|
Ivana Varekova |
39397c8 |
+ " --rsyncable Make rsync-friendly archive",
|
|
Ivana Varekova |
39397c8 |
"",
|
|
Ivana Varekova |
39397c8 |
"With no FILE, or when FILE is -, read standard input.",
|
|
Ivana Varekova |
39397c8 |
"",
|
|
Ivana Varekova |
39397c8 |
@@ -473,6 +476,9 @@
|
|
Ivana Varekova |
39397c8 |
recursive = 1;
|
|
Ivana Varekova |
39397c8 |
#endif
|
|
Ivana Varekova |
39397c8 |
break;
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
+ case 'R':
|
|
Ivana Varekova |
39397c8 |
+ rsync = 1; break;
|
|
Ivana Varekova |
39397c8 |
case 'S':
|
|
Ivana Varekova |
39397c8 |
#ifdef NO_MULTIPLE_DOTS
|
|
Ivana Varekova |
39397c8 |
if (*optarg == '.') optarg++;
|
|
Ivana Varekova |
39397c8 |
--- gzip-1.3.9/trees.c.pom 2006-11-20 09:40:33.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
+++ gzip-1.3.9/trees.c 2007-01-15 14:58:42.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
@@ -860,9 +860,10 @@
|
|
Ivana Varekova |
39397c8 |
* trees or store, and output the encoded block to the zip file. This function
|
|
Ivana Varekova |
39397c8 |
* returns the total compressed length for the file so far.
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
-off_t flush_block(buf, stored_len, eof)
|
|
Ivana Varekova |
39397c8 |
+off_t flush_block(buf, stored_len, pad, eof)
|
|
Ivana Varekova |
39397c8 |
char *buf; /* input block, or NULL if too old */
|
|
Ivana Varekova |
39397c8 |
ulg stored_len; /* length of input block */
|
|
Ivana Varekova |
39397c8 |
+ int pad; /* pad output to byte boundary */
|
|
Ivana Varekova |
39397c8 |
int eof; /* true if this is the last block for a file */
|
|
Ivana Varekova |
39397c8 |
{
|
|
Ivana Varekova |
39397c8 |
ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
|
|
Ivana Varekova |
39397c8 |
@@ -955,6 +956,10 @@
|
|
Ivana Varekova |
39397c8 |
Assert (input_len == bytes_in, "bad input size");
|
|
Ivana Varekova |
39397c8 |
bi_windup();
|
|
Ivana Varekova |
39397c8 |
compressed_len += 7; /* align on byte boundary */
|
|
Ivana Varekova |
39397c8 |
+ } else if (pad && (compressed_len % 8) != 0) {
|
|
Ivana Varekova |
39397c8 |
+ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */
|
|
Ivana Varekova |
39397c8 |
+ compressed_len = (compressed_len + 3 + 7) & ~7L;
|
|
Ivana Varekova |
39397c8 |
+ copy_block(buf, 0, 1); /* with header */
|
|
Ivana Varekova |
39397c8 |
}
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
return compressed_len >> 3;
|
|
Ivana Varekova |
39397c8 |
--- gzip-1.3.9/deflate.c.pom 2006-12-08 00:53:00.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
+++ gzip-1.3.9/deflate.c 2007-01-15 15:25:40.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
@@ -135,6 +135,14 @@
|
|
Ivana Varekova |
39397c8 |
#endif
|
|
Ivana Varekova |
39397c8 |
/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
+#ifndef RSYNC_WIN
|
|
Ivana Varekova |
39397c8 |
+# define RSYNC_WIN 4096
|
|
Ivana Varekova |
39397c8 |
+#endif
|
|
Ivana Varekova |
39397c8 |
+/* Size of rsync window, must be < MAX_DIST */
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
|
|
Ivana Varekova |
39397c8 |
+/* Whether window sum matches magic value */
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
/* ===========================================================================
|
|
Ivana Varekova |
39397c8 |
* Local data used by the "longest match" routines.
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
@@ -216,6 +224,8 @@
|
|
Ivana Varekova |
39397c8 |
unsigned near good_match;
|
|
Ivana Varekova |
39397c8 |
/* Use a faster search when the previous match is longer than this */
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
+local ulg rsync_sum; /* rolling sum of rsync window */
|
|
Ivana Varekova |
39397c8 |
+local ulg rsync_chunk_end; /* next rsync sequence point */
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
/* Values for max_lazy_match, good_match and max_chain_length, depending on
|
|
Ivana Varekova |
39397c8 |
* the desired pack level (0..9). The values given below have been tuned to
|
|
Ivana Varekova |
39397c8 |
@@ -314,6 +324,10 @@
|
|
Ivana Varekova |
39397c8 |
#endif
|
|
Ivana Varekova |
39397c8 |
/* prev will be initialized on the fly */
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
+ /* rsync params */
|
|
Ivana Varekova |
39397c8 |
+ rsync_chunk_end = 0xFFFFFFFFUL;
|
|
Ivana Varekova |
39397c8 |
+ rsync_sum = 0;
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
/* Set the default configuration parameters:
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
max_lazy_match = configuration_table[pack_level].max_lazy;
|
|
Ivana Varekova |
39397c8 |
@@ -550,6 +564,8 @@
|
|
Ivana Varekova |
39397c8 |
memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
|
|
Ivana Varekova |
39397c8 |
match_start -= WSIZE;
|
|
Ivana Varekova |
39397c8 |
strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */
|
|
Ivana Varekova |
39397c8 |
+ if (rsync_chunk_end != 0xFFFFFFFFUL)
|
|
Ivana Varekova |
39397c8 |
+ rsync_chunk_end -= WSIZE;
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
block_start -= (long) WSIZE;
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
@@ -577,13 +593,46 @@
|
|
Ivana Varekova |
39397c8 |
}
|
|
Ivana Varekova |
39397c8 |
}
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
+local void rsync_roll(start, num)
|
|
Ivana Varekova |
39397c8 |
+ unsigned start;
|
|
Ivana Varekova |
39397c8 |
+ unsigned num;
|
|
Ivana Varekova |
39397c8 |
+{
|
|
Ivana Varekova |
39397c8 |
+ unsigned i;
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
+ if (start < RSYNC_WIN) {
|
|
Ivana Varekova |
39397c8 |
+ /* before window fills. */
|
|
Ivana Varekova |
39397c8 |
+ for (i = start; i < RSYNC_WIN; i++) {
|
|
Ivana Varekova |
39397c8 |
+ if (i == start + num) return;
|
|
Ivana Varekova |
39397c8 |
+ rsync_sum += (ulg)window[i];
|
|
Ivana Varekova |
39397c8 |
+ }
|
|
Ivana Varekova |
39397c8 |
+ num -= (RSYNC_WIN - start);
|
|
Ivana Varekova |
39397c8 |
+ start = RSYNC_WIN;
|
|
Ivana Varekova |
39397c8 |
+ }
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
+ /* buffer after window full */
|
|
Ivana Varekova |
39397c8 |
+ for (i = start; i < start+num; i++) {
|
|
Ivana Varekova |
39397c8 |
+ /* New character in */
|
|
Ivana Varekova |
39397c8 |
+ rsync_sum += (ulg)window[i];
|
|
Ivana Varekova |
39397c8 |
+ /* Old character out */
|
|
Ivana Varekova |
39397c8 |
+ rsync_sum -= (ulg)window[i - RSYNC_WIN];
|
|
Ivana Varekova |
39397c8 |
+ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
|
|
Ivana Varekova |
39397c8 |
+ rsync_chunk_end = i;
|
|
Ivana Varekova |
39397c8 |
+ }
|
|
Ivana Varekova |
39397c8 |
+}
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
+/* ===========================================================================
|
|
Ivana Varekova |
39397c8 |
+ * Set rsync_chunk_end if window sum matches magic value.
|
|
Ivana Varekova |
39397c8 |
+ */
|
|
Ivana Varekova |
39397c8 |
+#define RSYNC_ROLL(s, n) \
|
|
Ivana Varekova |
39397c8 |
+ do { if (rsync) rsync_roll((s), (n)); } while(0)
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
/* ===========================================================================
|
|
Ivana Varekova |
39397c8 |
* Flush the current block, with given end-of-file flag.
|
|
Ivana Varekova |
39397c8 |
* IN assertion: strstart is set to the end of the current match.
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
#define FLUSH_BLOCK(eof) \
|
|
Ivana Varekova |
39397c8 |
flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
|
|
Ivana Varekova |
39397c8 |
- (char*)NULL, (long)strstart - block_start, (eof))
|
|
Ivana Varekova |
39397c8 |
+ (char*)NULL, (long)strstart - block_start, flush-1, (eof))
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
/* ===========================================================================
|
|
Ivana Varekova |
39397c8 |
* Processes a new input file and return its compressed length. This
|
|
Ivana Varekova |
39397c8 |
@@ -594,7 +643,7 @@
|
|
Ivana Varekova |
39397c8 |
local off_t deflate_fast()
|
|
Ivana Varekova |
39397c8 |
{
|
|
Ivana Varekova |
39397c8 |
IPos hash_head; /* head of the hash chain */
|
|
Ivana Varekova |
39397c8 |
- int flush; /* set if current block must be flushed */
|
|
Ivana Varekova |
39397c8 |
+ int flush; /* set if current block must be flushed, 2=>and padded */
|
|
Ivana Varekova |
39397c8 |
unsigned match_length = 0; /* length of best match */
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
prev_length = MIN_MATCH-1;
|
|
Ivana Varekova |
39397c8 |
@@ -624,6 +673,7 @@
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
lookahead -= match_length;
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
+ RSYNC_ROLL(strstart, match_length);
|
|
Ivana Varekova |
39397c8 |
/* Insert new strings in the hash table only if the match length
|
|
Ivana Varekova |
39397c8 |
* is not too large. This saves time but degrades compression.
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
@@ -652,9 +702,14 @@
|
|
Ivana Varekova |
39397c8 |
/* No match, output a literal byte */
|
|
Ivana Varekova |
39397c8 |
Tracevv((stderr,"%c",window[strstart]));
|
|
Ivana Varekova |
39397c8 |
flush = ct_tally (0, window[strstart]);
|
|
Ivana Varekova |
39397c8 |
+ RSYNC_ROLL(strstart, 1);
|
|
Ivana Varekova |
39397c8 |
lookahead--;
|
|
Ivana Varekova |
39397c8 |
strstart++;
|
|
Ivana Varekova |
39397c8 |
}
|
|
Ivana Varekova |
39397c8 |
+ if (rsync && strstart > rsync_chunk_end) {
|
|
Ivana Varekova |
39397c8 |
+ rsync_chunk_end = 0xFFFFFFFFUL;
|
|
Ivana Varekova |
39397c8 |
+ flush = 2;
|
|
Ivana Varekova |
39397c8 |
+ }
|
|
Ivana Varekova |
39397c8 |
if (flush) FLUSH_BLOCK(0), block_start = strstart;
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
/* Make sure that we always have enough lookahead, except
|
|
Ivana Varekova |
39397c8 |
@@ -728,6 +783,7 @@
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
lookahead -= prev_length-1;
|
|
Ivana Varekova |
39397c8 |
prev_length -= 2;
|
|
Ivana Varekova |
39397c8 |
+ RSYNC_ROLL(strstart, prev_length+1);
|
|
Ivana Varekova |
39397c8 |
do {
|
|
Ivana Varekova |
39397c8 |
strstart++;
|
|
Ivana Varekova |
39397c8 |
INSERT_STRING(strstart, hash_head);
|
|
Ivana Varekova |
39397c8 |
@@ -740,24 +796,40 @@
|
|
Ivana Varekova |
39397c8 |
match_available = 0;
|
|
Ivana Varekova |
39397c8 |
match_length = MIN_MATCH-1;
|
|
Ivana Varekova |
39397c8 |
strstart++;
|
|
Ivana Varekova |
39397c8 |
- if (flush) FLUSH_BLOCK(0), block_start = strstart;
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
+ if (rsync && strstart > rsync_chunk_end) {
|
|
Ivana Varekova |
39397c8 |
+ rsync_chunk_end = 0xFFFFFFFFUL;
|
|
Ivana Varekova |
39397c8 |
+ flush = 2;
|
|
Ivana Varekova |
39397c8 |
+ }
|
|
Ivana Varekova |
39397c8 |
+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
|
|
Ivana Varekova |
39397c8 |
} else if (match_available) {
|
|
Ivana Varekova |
39397c8 |
/* If there was no match at the previous position, output a
|
|
Ivana Varekova |
39397c8 |
* single literal. If there was a match but the current match
|
|
Ivana Varekova |
39397c8 |
* is longer, truncate the previous match to a single literal.
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
Tracevv((stderr,"%c",window[strstart-1]));
|
|
Ivana Varekova |
39397c8 |
- if (ct_tally (0, window[strstart-1])) {
|
|
Ivana Varekova |
39397c8 |
- FLUSH_BLOCK(0), block_start = strstart;
|
|
Ivana Varekova |
39397c8 |
+ flush = ct_tally (0, window[strstart-1]);
|
|
Ivana Varekova |
39397c8 |
+ if (rsync && strstart > rsync_chunk_end) {
|
|
Ivana Varekova |
39397c8 |
+ rsync_chunk_end = 0xFFFFFFFFUL;
|
|
Ivana Varekova |
39397c8 |
+ flush = 2;
|
|
Ivana Varekova |
39397c8 |
}
|
|
Ivana Varekova |
39397c8 |
+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
|
|
Ivana Varekova |
39397c8 |
+ RSYNC_ROLL(strstart, 1);
|
|
Ivana Varekova |
39397c8 |
strstart++;
|
|
Ivana Varekova |
39397c8 |
lookahead--;
|
|
Ivana Varekova |
39397c8 |
} else {
|
|
Ivana Varekova |
39397c8 |
/* There is no previous match to compare with, wait for
|
|
Ivana Varekova |
39397c8 |
* the next step to decide.
|
|
Ivana Varekova |
39397c8 |
*/
|
|
Ivana Varekova |
39397c8 |
+ if (rsync && strstart > rsync_chunk_end) {
|
|
Ivana Varekova |
39397c8 |
+ /* Reset huffman tree */
|
|
Ivana Varekova |
39397c8 |
+ rsync_chunk_end = 0xFFFFFFFFUL;
|
|
Ivana Varekova |
39397c8 |
+ flush = 2;
|
|
Ivana Varekova |
39397c8 |
+ FLUSH_BLOCK(0), block_start = strstart;
|
|
Ivana Varekova |
39397c8 |
+ }
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
match_available = 1;
|
|
Ivana Varekova |
39397c8 |
+ RSYNC_ROLL(strstart, 1);
|
|
Ivana Varekova |
39397c8 |
strstart++;
|
|
Ivana Varekova |
39397c8 |
lookahead--;
|
|
Ivana Varekova |
39397c8 |
}
|
|
Ivana Varekova |
39397c8 |
--- gzip-1.3.9/gzip.h.pom 2006-12-11 19:54:39.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
+++ gzip-1.3.9/gzip.h 2007-01-15 14:47:01.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
@@ -155,6 +155,7 @@
|
|
Ivana Varekova |
39397c8 |
extern unsigned insize; /* valid bytes in inbuf */
|
|
Ivana Varekova |
39397c8 |
extern unsigned inptr; /* index of next byte to be processed in inbuf */
|
|
Ivana Varekova |
39397c8 |
extern unsigned outcnt; /* bytes in output buffer */
|
|
Ivana Varekova |
39397c8 |
+extern int rsync; /* deflate into rsyncable chunks */
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
extern off_t bytes_in; /* number of input bytes */
|
|
Ivana Varekova |
39397c8 |
extern off_t bytes_out; /* number of output bytes */
|
|
Ivana Varekova |
39397c8 |
@@ -303,7 +304,7 @@
|
|
Ivana Varekova |
39397c8 |
/* in trees.c */
|
|
Ivana Varekova |
39397c8 |
void ct_init OF((ush *attr, int *method));
|
|
Ivana Varekova |
39397c8 |
int ct_tally OF((int dist, int lc));
|
|
Ivana Varekova |
39397c8 |
-off_t flush_block OF((char *buf, ulg stored_len, int eof));
|
|
Ivana Varekova |
39397c8 |
+off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof));
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
/* in bits.c */
|
|
Ivana Varekova |
39397c8 |
void bi_init OF((file_t zipfile));
|
|
Ivana Varekova |
39397c8 |
--- gzip-1.3.9/doc/gzip.texi.pom 2006-12-08 19:45:37.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
+++ gzip-1.3.9/doc/gzip.texi 2007-01-15 15:30:00.000000000 +0100
|
|
Ivana Varekova |
39397c8 |
@@ -334,6 +334,14 @@
|
|
Ivana Varekova |
39397c8 |
into the directory and compress all the files it finds there (or
|
|
Ivana Varekova |
39397c8 |
decompress them in the case of @code{gunzip}).
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
+@item --rsyncable
|
|
Ivana Varekova |
39397c8 |
+While compressing, synchronize the output occasionally based on the
|
|
Ivana Varekova |
39397c8 |
+input. This reduces compression by about 1 percent most cases, but
|
|
Ivana Varekova |
39397c8 |
+means that the @code{rsync} program can take advantage of similarities
|
|
Ivana Varekova |
39397c8 |
+in the uncompressed input when syncronizing two files compressed with
|
|
Ivana Varekova |
39397c8 |
+this flag. @code{gunzip} cannot tell the difference between a
|
|
Ivana Varekova |
39397c8 |
+compressed file created with this option, and one created without it.
|
|
Ivana Varekova |
39397c8 |
+
|
|
Ivana Varekova |
39397c8 |
@item --suffix @var{suf}
|
|
Ivana Varekova |
39397c8 |
@itemx -S @var{suf}
|
|
Ivana Varekova |
39397c8 |
Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
|