X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2473391971b10ab9fdec66714d25d2ba357a3ac8..9935066b704bcf2e6e48dac85cb1b4047d8f439d:/token.c diff --git a/token.c b/token.c index 0b3aa999..da3a85b0 100644 --- a/token.c +++ b/token.c @@ -51,7 +51,7 @@ void set_compression(char *fname) strlower(fname); for (tok=strtok(dont," ");tok;tok=strtok(NULL," ")) { - if (fnmatch(tok, fname, 0) == 0) { + if (wildmatch(tok, fname)) { compression_level = 0; break; } @@ -68,7 +68,7 @@ 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"); } @@ -90,8 +90,8 @@ static int simple_recv_token(int f,char **data) static void simple_send_token(int f,int token, struct map_struct *buf,OFF_T offset,int n) { - extern int write_batch; /* dw */ - int hold_int; /* dw */ + extern int write_batch; + int hold_int; if (n > 0) { int l = 0; @@ -100,8 +100,8 @@ static void simple_send_token(int f,int token, 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); + write_batch_delta_file( (char *) &n1, sizeof(int) ); + write_batch_delta_file(map_ptr(buf,offset+l,n1),n1); } l += n1; } @@ -110,8 +110,8 @@ static void simple_send_token(int f,int 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) ); + hold_int = -(token+1); + write_batch_delta_file( (char *) &hold_int, sizeof(int) ); } } } @@ -159,8 +159,8 @@ send_deflated_token(int f, int token, { int n, r; static int init_done, flush_pending; - extern int write_batch; /* dw */ - char temp_byte; /* dw */ + extern int write_batch; + char temp_byte; if (last_token == -1) { /* initialization */ @@ -174,7 +174,7 @@ send_deflated_token(int f, int token, 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 @@ -193,26 +193,27 @@ send_deflated_token(int f, int token, 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)); + 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) { /* 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 (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) { /* dw */ - write_batch_delta_file((char *)&n,sizeof(char)); - temp_byte = (char) n >> 8; - write_batch_delta_file(&temp_byte,sizeof(temp_byte)); + 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; @@ -272,8 +273,8 @@ send_deflated_token(int f, int 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); + if (write_batch) + write_batch_delta_file(obuf,n+2); } } } while (nb != 0 || tx_strm.avail_out == 0); @@ -283,9 +284,9 @@ send_deflated_token(int f, int token, 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)); + if (write_batch) { + temp_byte = END_FLAG; + write_batch_delta_file(&temp_byte,sizeof(char)); } } else if (token != -2) { @@ -336,8 +337,8 @@ recv_deflated_token(int f, char **data) rprintf(FERROR, "inflate init failed\n"); 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 { @@ -366,9 +367,9 @@ recv_deflated_token(int f, char **data) /* 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 @@ -422,9 +423,9 @@ recv_deflated_token(int f, char **data) 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(RERR_STREAMIO); @@ -479,7 +480,7 @@ static void see_deflate_token(char *buf, int len) } } 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);