search for: write_batch_csums_fil

...; 0) { read_batch_flist_file(buff, int_str_len); buff[int_str_len] = '\0'; - file[0].sum = strdup(buff); + file[0].sum = (unsigned char *)strdup(buff); } else { file[0].sum = NULL; } } -void write_batch_csums_file(char *buff, int bytes_to_write) +void write_batch_csums_file(const void *buff, int bytes_to_write) { static int fdb_open = 1; @@ -377,7 +378,7 @@ } } -void close_batch_csums_file() +void close_batch_csums_file(void) { close(fdb); @@ -394,12 +395,12 @@...

....c -o fileio.o cc -I. -I. -g -DHAVE_CONFIG_H -I./popt -c batch.c -o batch.o cc: Error: batch.c, line 408: In this statement, a common type could not be determined for the 2nd and 3rd operands ("&s->count" and "&int_zero") of a conditional operator. (badcondit) write_batch_csums_file(s ? &s->count : &int_zero, sizeof(int)); -------------------------------^ *** Exit 1 Stop. [root@hyperion: rsync-2.5.4]# Thank you, Bob Eckert - Principal Analyst eckert@indiana.edu (812) 855-7209 - (812) 855-8299 Fax Indiana Univer...

...-I. -g -DHAVE_CONFIG_H -I./popt -c batch.c -o batch.o > cc: Error: batch.c, line 408: In this statement, a common type could > not be determined for the 2nd and 3rd operands ("&s->count" and > "&int_zero") of a conditional operator. (badcondit) > write_batch_csums_file(s ? &s->count : &int_zero, > sizeof(int)); -------------------------------^ > *** Exit 1 Line 406 says: /* FIXME: This will break if s->count is ever not exactly an int. */ s->count is a size_t, which is 64 bits on your compiler. Here's how I would fix it: ====...

...write assignment + * in write_batch_flist_info() + */ read_batch_flist_file((char *) &file->modtime, sizeof(time_t)); read_batch_flist_file((char *) &file->length, sizeof(OFF_T)); read_batch_flist_file((char *) &file->mode, sizeof(mode_t)); @@ -356,20 +354,23 @@ void write_batch_csums_file(void *buff, int bytes_to_write) { - static int fdb_open = 1; + char filename[MAXPATHLEN]; if (fdb_open) { /* Set up file extension */ - strcat(rsync_csums_file, batch_file_ext); + strlcpy(filename, batch_prefix, sizeof(filename)); + strlcat(filename, rsync_csums_file, sizeof(filename)...

...cc -I. -I. -O2 -std1 -DHAVE_CONFIG_H -I./popt -c batch.c -o batch.o cc: Error: batch.c, line 408: In this statement, a common type could not be determined for the 2nd and 3rd operands ("&s->count" and "&int_zero") of a conditional operator. (badcondit) write_batch_csums_file(s ? &s->count : &int_zero, sizeof(int)); -------------------------------^ gmake: *** [batch.o] Error 1 If I case &s->count to (unsigned int *), then it compiles. -- albert chin (china@thewrittenword.com)

...* If flist_entry < 0, just open the file * * @todo This will break if s->count is ever larger than maxint. The * batch code should probably be changed to consistently use the *************** *** 198,203 **** --- 199,206 ---- } } + if (*flist_entry < 0) + return; write_batch_csums_file(flist_entry, sizeof (int)); int_count = s ? (int) s->count : 0; write_batch_csums_file(&int_count, sizeof int_count); *************** *** 285,290 **** --- 288,296 ---- } } + if (buff == NULL) + return; + if (write(f_delta, buff, bytes_to_write) < 0) { rsyserr(F...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.