#include "zlib/zlib.h"
extern int do_compression;
+static int compression_level = Z_DEFAULT_COMPRESSION;
+/* determine the compression level based on a wildcard filename list */
+void set_compression(char *fname)
+{
+ extern int module_id;
+ char *dont;
+ char *tok;
+
+ if (!do_compression) return;
+
+ compression_level = Z_DEFAULT_COMPRESSION;
+ dont = lp_dont_compress(module_id);
+
+ if (!dont || !*dont) return;
+
+ if ((dont[0] == '*') && (!dont[1])) {
+ /* an optimization to skip the rest of this routine */
+ compression_level = 0;
+ return;
+ }
+
+ dont = strdup(dont);
+ fname = strdup(fname);
+ if (!dont || !fname) return;
+
+ strlower(dont);
+ strlower(fname);
+
+ for (tok=strtok(dont," ");tok;tok=strtok(NULL," ")) {
+ if (wildmatch(tok, fname)) {
+ compression_level = 0;
+ break;
+ }
+ }
+ free(dont);
+ free(fname);
+}
/* non-compressing recv token */
static int simple_recv_token(int f,char **data)
int n;
if (!buf) {
- buf = (char *)malloc(CHUNK_SIZE);
+ buf = new_array(char, CHUNK_SIZE);
if (!buf) out_of_memory("simple_recv_token");
}
static void simple_send_token(int f,int token,
struct map_struct *buf,OFF_T offset,int n)
{
+ extern int write_batch;
+ int hold_int;
+
if (n > 0) {
int l = 0;
while (l < n) {
int n1 = MIN(CHUNK_SIZE,n-l);
write_int(f,n1);
write_buf(f,map_ptr(buf,offset+l,n1),n1);
+ if (write_batch) {
+ write_batch_delta_file( (char *) &n1, sizeof(int) );
+ write_batch_delta_file(map_ptr(buf,offset+l,n1),n1);
+ }
l += n1;
}
}
/* a -2 token means to send data only and no token */
if (token != -2) {
write_int(f,-(token+1));
+ if (write_batch) {
+ hold_int = -(token+1);
+ write_batch_delta_file( (char *) &hold_int, sizeof(int) );
+ }
}
}
#define MAX_DATA_COUNT 16383 /* fit 14 bit count into 2 bytes with flags */
+/* zlib.h says that if we want to be able to compress something in a single
+ * call, avail_out must be at least 0.1% larger than avail_in plus 12 bytes.
+ * We'll add in 0.1%+16, just to be safe (and we'll avoid floating point,
+ * to ensure that this is a compile-time value). */
+#define AVAIL_OUT_SIZE(avail_in_size) ((avail_in_size)*1001/1000+16)
+
/* For coding runs of tokens */
static int last_token = -1;
static int run_start;
/* Output buffer */
static char *obuf;
+/* We want obuf to be able to hold both MAX_DATA_COUNT+2 bytes as well as
+ * AVAIL_OUT_SIZE(CHUNK_SIZE) bytes, so make sure that it's large enough. */
+#if MAX_DATA_COUNT+2 > AVAIL_OUT_SIZE(CHUNK_SIZE)
+#define OBUF_SIZE (MAX_DATA_COUNT+2)
+#else
+#define OBUF_SIZE AVAIL_OUT_SIZE(CHUNK_SIZE)
+#endif
+
/* Send a deflated token */
static void
send_deflated_token(int f, int token,
{
int n, r;
static int init_done, flush_pending;
+ extern int write_batch;
+ char temp_byte;
if (last_token == -1) {
/* initialization */
tx_strm.next_in = NULL;
tx_strm.zalloc = NULL;
tx_strm.zfree = NULL;
- if (deflateInit2(&tx_strm, Z_DEFAULT_COMPRESSION,
+ if (deflateInit2(&tx_strm, compression_level,
Z_DEFLATED, -15, 8,
Z_DEFAULT_STRATEGY) != Z_OK) {
rprintf(FERROR, "compression init failed\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
- if ((obuf = malloc(MAX_DATA_COUNT+2)) == NULL)
+ if ((obuf = new_array(char, OBUF_SIZE)) == NULL)
out_of_memory("send_deflated_token");
init_done = 1;
} else
n = last_token - run_start;
if (r >= 0 && r <= 63) {
write_byte(f, (n==0? TOKEN_REL: TOKENRUN_REL) + r);
+ if (write_batch) {
+ temp_byte = (char)( (n==0? TOKEN_REL: TOKENRUN_REL) + r);
+ write_batch_delta_file(&temp_byte,sizeof(char));
+ }
} else {
write_byte(f, (n==0? TOKEN_LONG: TOKENRUN_LONG));
write_int(f, run_start);
+ if (write_batch) {
+ temp_byte = (char)(n==0? TOKEN_LONG: TOKENRUN_LONG);
+ write_batch_delta_file(&temp_byte,sizeof(char));
+ write_batch_delta_file((char *)&run_start,sizeof(run_start));
+ }
}
if (n != 0) {
write_byte(f, n);
write_byte(f, n >> 8);
+ if (write_batch) {
+ temp_byte = (char)n;
+ write_batch_delta_file(&temp_byte,sizeof(char));
+ temp_byte = (char)(n >> 8);
+ write_batch_delta_file(&temp_byte,sizeof(char));
+ }
}
last_run_end = last_token;
run_start = token;
r = deflate(&tx_strm, flush);
if (r != Z_OK) {
rprintf(FERROR, "deflate returned %d\n", r);
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
if (nb == 0 || tx_strm.avail_out == 0) {
n = MAX_DATA_COUNT - tx_strm.avail_out;
obuf[0] = DEFLATED_DATA + (n >> 8);
obuf[1] = n;
write_buf(f, obuf, n+2);
+ if (write_batch)
+ write_batch_delta_file(obuf,n+2);
}
}
} while (nb != 0 || tx_strm.avail_out == 0);
if (token == -1) {
/* end of file - clean up */
write_byte(f, END_FLAG);
+ if (write_batch) {
+ temp_byte = END_FLAG;
+ write_batch_delta_file(&temp_byte,sizeof(char));
+ }
} else if (token != -2) {
/* add the data in the current block to the compressor's
tx_strm.next_in = (Bytef *) map_ptr(buf, offset, toklen);
tx_strm.avail_in = toklen;
tx_strm.next_out = (Bytef *) obuf;
- tx_strm.avail_out = MAX_DATA_COUNT;
+ tx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = deflate(&tx_strm, Z_INSERT_ONLY);
if (r != Z_OK || tx_strm.avail_in != 0) {
rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n",
r, tx_strm.avail_in);
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
}
}
rx_strm.zfree = NULL;
if (inflateInit2(&rx_strm, -15) != Z_OK) {
rprintf(FERROR, "inflate init failed\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
- if ((cbuf = malloc(MAX_DATA_COUNT)) == NULL
- || (dbuf = malloc(CHUNK_SIZE)) == NULL)
+ if (!(cbuf = new_array(char, MAX_DATA_COUNT))
+ || !(dbuf = new_array(char, AVAIL_OUT_SIZE(CHUNK_SIZE))))
out_of_memory("recv_deflated_token");
init_done = 1;
} else {
/* check previous inflated stuff ended correctly */
rx_strm.avail_in = 0;
rx_strm.next_out = (Bytef *)dbuf;
- rx_strm.avail_out = CHUNK_SIZE;
+ rx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = inflate(&rx_strm, Z_SYNC_FLUSH);
- n = CHUNK_SIZE - rx_strm.avail_out;
+ n = AVAIL_OUT_SIZE(CHUNK_SIZE) - rx_strm.avail_out;
/*
* Z_BUF_ERROR just means no progress was
* made, i.e. the decompressor didn't have
if (r != Z_OK && r != Z_BUF_ERROR) {
rprintf(FERROR, "inflate flush returned %d (%d bytes)\n",
r, n);
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
if (n != 0 && r != Z_BUF_ERROR) {
/* have to return some more data and
*/
if (!inflateSyncPoint(&rx_strm)) {
rprintf(FERROR, "decompressor lost sync!\n");
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
rx_strm.avail_in = 4;
rx_strm.next_in = (Bytef *)cbuf;
case r_inflating:
rx_strm.next_out = (Bytef *)dbuf;
- rx_strm.avail_out = CHUNK_SIZE;
+ rx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = inflate(&rx_strm, Z_NO_FLUSH);
- n = CHUNK_SIZE - rx_strm.avail_out;
+ n = AVAIL_OUT_SIZE(CHUNK_SIZE) - rx_strm.avail_out;
if (r != Z_OK) {
rprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
if (rx_strm.avail_in == 0)
recv_state = r_inflated;
}
}
rx_strm.next_out = (Bytef *)dbuf;
- rx_strm.avail_out = CHUNK_SIZE;
+ rx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = inflate(&rx_strm, Z_SYNC_FLUSH);
if (r != Z_OK) {
rprintf(FERROR, "inflate (token) returned %d\n", r);
- exit_cleanup(1);
+ exit_cleanup(RERR_STREAMIO);
}
} while (len || rx_strm.avail_out == 0);
}
-/*
- * transmit a verbatim buffer of length n followed by a token
+/**
+ * Transmit a verbatim buffer of length @p n followed by a token.
* If token == -1 then we have reached EOF
* If n == 0 then don't send a buffer
*/
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff