X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5b7bcac26081ae72da6c5d2e6d8247de17f36b93..fdd10da6f7995296f6bb5ee3dd7231d6dbc20b5e:/token.c diff --git a/token.c b/token.c index 201862e4..d3cee049 100644 --- a/token.c +++ b/token.c @@ -1,73 +1,90 @@ /* - 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. -*/ + * Routines used by the file-transfer code. + * + * Copyright (C) 1996 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2003, 2004, 2005 Wayne Davison + * + * 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., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" #include "zlib/zlib.h" extern int do_compression; extern int module_id; +extern int def_compress_level; -static int compression_level = Z_DEFAULT_COMPRESSION; +static int compression_level, per_file_default_level; /* determine the compression level based on a wildcard filename list */ void set_compression(char *fname) { - char *dont; - char *tok; + static char *match_list; + char *s; 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; + if (!match_list) { + char *t, *f = lp_dont_compress(module_id); + int len = strlen(f); + if (!(match_list = t = new_array(char, len + 2))) + out_of_memory("set_compression"); + while (*f) { + if (*f == ' ') { + f++; + continue; + } + do { + if (isupper(*(unsigned char *)f)) + *t++ = tolower(*(unsigned char *)f); + else + *t++ = *f; + } while (*++f != ' ' && *f); + *t++ = '\0'; + } + /* Optimize a match-string of "*". */ + if (t - match_list == 2 && match_list[0] == '*') { + t = match_list; + per_file_default_level = 0; + } else + per_file_default_level = def_compress_level; + *t++ = '\0'; } - dont = strdup(dont); - fname = strdup(fname); - if (!dont || !fname) + compression_level = per_file_default_level; + + if (!*match_list) return; - strlower(dont); - strlower(fname); + if ((s = strrchr(fname, '/')) != NULL) + fname = s + 1; - for (tok = strtok(dont, " "); tok; tok = strtok(NULL, " ")) { - if (wildmatch(tok, fname)) { + for (s = match_list; *s; s += strlen(s) + 1) { + if (iwildmatch(s, fname)) { compression_level = 0; break; } } - free(dont); - free(fname); } /* non-compressing recv token */ static int32 simple_recv_token(int f, char **data) { - static int residue; + static int32 residue; static char *buf; int32 n; @@ -91,9 +108,8 @@ static int32 simple_recv_token(int f, char **data) return n; } - /* non-compressing send token */ -static void simple_send_token(int f, int token, struct map_struct *buf, +static void simple_send_token(int f, int32 token, struct map_struct *buf, OFF_T offset, int32 n) { if (n > 0) { @@ -110,7 +126,6 @@ static void simple_send_token(int f, int token, struct map_struct *buf, write_int(f, -(token+1)); } - /* Flag bytes in compressed stream are encoded as follows: */ #define END_FLAG 0 /* that's all folks */ #define TOKEN_LONG 0x20 /* followed by 32-bit token number */ @@ -128,9 +143,9 @@ static void simple_send_token(int f, int token, struct map_struct *buf, #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; -static int last_run_end; +static int32 last_token = -1; +static int32 run_start; +static int32 last_run_end; /* Deflation state */ static z_stream tx_strm; @@ -148,7 +163,7 @@ static char *obuf; /* Send a deflated token */ static void -send_deflated_token(int f, int token, struct map_struct *buf, OFF_T offset, +send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset, int32 nb, int32 toklen) { int32 n, r; @@ -174,10 +189,8 @@ send_deflated_token(int f, int token, struct map_struct *buf, OFF_T offset, last_run_end = 0; run_start = token; flush_pending = 0; - } else if (last_token == -2) { run_start = token; - } else if (nb != 0 || token != last_token + 1 || token >= run_start + 65536) { /* output previous run */ @@ -260,28 +273,27 @@ send_deflated_token(int f, int token, struct map_struct *buf, OFF_T offset, /* end of file - clean up */ write_byte(f, END_FLAG); } else if (token != -2) { - /* add the data in the current block to the compressor's - history and hash table */ + /* Add the data in the current block to the compressor's + * history and hash table. */ do { - n = MIN(toklen, CHUNK_SIZE); - tx_strm.next_in = (Bytef *) map_ptr(buf, offset, n); - tx_strm.avail_in = n; - tx_strm.next_out = (Bytef *)obuf; + /* Break up long sections in the same way that + * see_deflate_token() does. */ + int32 n1 = toklen > 0xffff ? 0xffff : toklen; + toklen -= n1; + tx_strm.next_in = (Bytef *)map_ptr(buf, offset, n1); + tx_strm.avail_in = n1; + tx_strm.next_out = (Bytef *) obuf; 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", + rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n", r, tx_strm.avail_in); exit_cleanup(RERR_STREAMIO); } - toklen -= n; - offset += n; - } while (toklen); + } while (toklen > 0); } } - /* tells us what the receiver is in the middle of doing */ static enum { r_init, r_idle, r_running, r_inflating, r_inflated } recv_state; @@ -298,9 +310,9 @@ static int32 rx_run; static int32 recv_deflated_token(int f, char **data) { static int init_done; - static int saved_flag; - int r, flag; - int32 n; + static int32 saved_flag; + int32 n, flag; + int r; for (;;) { switch (recv_state) { @@ -429,7 +441,8 @@ static int32 recv_deflated_token(int f, char **data) */ static void see_deflate_token(char *buf, int32 len) { - int r, blklen; + int r; + int32 blklen; unsigned char hdr[5]; rx_strm.avail_in = 0; @@ -470,7 +483,7 @@ static void see_deflate_token(char *buf, int32 len) * 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, +void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset, int32 n, int32 toklen) { if (!do_compression) @@ -479,7 +492,6 @@ void send_token(int f, int token, struct map_struct *buf, OFF_T offset, send_deflated_token(f, token, buf, offset, n, toklen); } - /* * receive a token or buffer from the other end. If the reurn value is >0 then * it is a data buffer of that length, and *data will point at the data.