-/*
+/*
Copyright (C) Andrew Tridgell 1996
Copyright (C) Paul Mackerras 1996
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "zlib/zlib.h"
extern int do_compression;
+extern int module_id;
+
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;
+ if (!do_compression)
+ return;
compression_level = Z_DEFAULT_COMPRESSION;
dont = lp_dont_compress(module_id);
- if (!dont || !*dont) return;
+ if (!dont || !*dont)
+ return;
- if ((dont[0] == '*') && (!dont[1])) {
+ 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;
+ if (!dont || !fname)
+ return;
strlower(dont);
strlower(fname);
- for (tok=strtok(dont," ");tok;tok=strtok(NULL," ")) {
+ for (tok = strtok(dont, " "); tok; tok = strtok(NULL, " ")) {
if (wildmatch(tok, fname)) {
compression_level = 0;
break;
}
/* non-compressing recv token */
-static int simple_recv_token(int f,char **data)
+static int32 simple_recv_token(int f, char **data)
{
static int residue;
static char *buf;
- int n;
+ int32 n;
if (!buf) {
- buf = (char *)malloc(CHUNK_SIZE);
- if (!buf) out_of_memory("simple_recv_token");
+ buf = new_array(char, CHUNK_SIZE);
+ if (!buf)
+ out_of_memory("simple_recv_token");
}
if (residue == 0) {
- int i = read_int(f);
- if (i <= 0) return i;
+ int32 i = read_int(f);
+ if (i <= 0)
+ return i;
residue = i;
}
/* non-compressing send token */
-static void simple_send_token(int f,int token,
- struct map_struct *buf,OFF_T offset,int n)
+static void simple_send_token(int f, int token, struct map_struct *buf,
+ OFF_T offset, int32 n)
{
- extern int write_batch; /* dw */
- int hold_int; /* dw */
-
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;
+ int32 len = 0;
+ while (len < n) {
+ int32 n1 = MIN(CHUNK_SIZE, n-len);
+ write_int(f, n1);
+ write_buf(f, map_ptr(buf, offset+len, n1), n1);
+ len += 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) );
- }
- }
+ if (token != -2)
+ write_int(f, -(token+1));
}
/* Send a deflated token */
static void
-send_deflated_token(int f, int token,
- struct map_struct *buf, OFF_T offset, int nb, int toklen)
+send_deflated_token(int f, int token, struct map_struct *buf, OFF_T offset,
+ int32 nb, int32 toklen)
{
- int n, r;
+ int32 n, r;
static int init_done, flush_pending;
- extern int write_batch; /* dw */
- char temp_byte; /* dw */
if (last_token == -1) {
/* initialization */
rprintf(FERROR, "compression init failed\n");
exit_cleanup(RERR_STREAMIO);
}
- if ((obuf = malloc(OBUF_SIZE)) == 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) { /* dw */
- 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) { /* dw */
- temp_byte = (char)(n==0? TOKEN_LONG: TOKENRUN_LONG);
- write_batch_delta_file(&temp_byte,sizeof(temp_byte));
- 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) { /* dw */
- write_batch_delta_file((char *)&n,sizeof(char));
- temp_byte = (char) n >> 8;
- write_batch_delta_file(&temp_byte,sizeof(temp_byte));
- }
}
last_run_end = last_token;
run_start = token;
obuf[0] = DEFLATED_DATA + (n >> 8);
obuf[1] = n;
write_buf(f, obuf, n+2);
- if (write_batch) /* dw */
- 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) { /* dw */
- temp_byte = END_FLAG;
- write_batch_delta_file((char *)&temp_byte,sizeof(temp_byte));
- }
-
} else if (token != -2) {
/* add the data in the current block to the compressor's
history and hash table */
static char *dbuf;
/* for decoding runs of tokens */
-static int rx_token;
-static int rx_run;
+static int32 rx_token;
+static int32 rx_run;
/* Receive a deflated token and inflate it */
-static int
-recv_deflated_token(int f, char **data)
+static int32 recv_deflated_token(int f, char **data)
{
- int n, r, flag;
static int init_done;
static int saved_flag;
+ int r, flag;
+ int32 n;
for (;;) {
switch (recv_state) {
rprintf(FERROR, "inflate init failed\n");
exit_cleanup(RERR_STREAMIO);
}
- if ((cbuf = malloc(MAX_DATA_COUNT)) == NULL
- || (dbuf = malloc(AVAIL_OUT_SIZE(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 {
* put the data corresponding to a token that we've just returned
* from recv_deflated_token into the decompressor's history buffer.
*/
-static void see_deflate_token(char *buf, int len)
+static void see_deflate_token(char *buf, int32 len)
{
int r, blklen;
unsigned char hdr[5];
/**
* Transmit a verbatim buffer of length @p n followed by a token.
- * If token == -1 then we have reached EOF
+ * If token == -1 then we have reached EOF
* If n == 0 then don't send a buffer
*/
-void send_token(int f,int token,struct map_struct *buf,OFF_T offset,
- int n,int toklen)
+void send_token(int f, int token, struct map_struct *buf, OFF_T offset,
+ int32 n, int32 toklen)
{
- if (!do_compression) {
- simple_send_token(f,token,buf,offset,n);
- } else {
+ if (!do_compression)
+ simple_send_token(f, token, buf, offset, n);
+ else
send_deflated_token(f, token, buf, offset, n, toklen);
- }
}
* if the return value is -i then it represents token i-1
* if the return value is 0 then the end has been reached
*/
-int recv_token(int f,char **data)
+int32 recv_token(int f, char **data)
{
int tok;
/*
* look at the data corresponding to a token, if necessary
*/
-void see_token(char *data, int toklen)
+void see_token(char *data, int32 toklen)
{
if (do_compression)
see_deflate_token(data, toklen);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff