search for: flist_entry

...ff, 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 @@ /* Write csum info to batch file */ - write_batch_csums_file((char *) flist_entry, sizeof(int)); - write_batch_csums_file((char *) (s ? &s->count : &int_zero), + write_batch_csums_file( flist_entry, sizeof(int)); + write_batch_csums_file( (s ? &s->count : &int_zero), sizeof(int)); if (s) {...

...@@ -423,7 +424,7 @@ } } -int read_batch_csums_file(char *buff, int len) +int read_batch_csums_file(void *buff, int len) { static int fdb_open = 1; int bytes_read; @@ -469,7 +470,7 @@ extern int csum_length; - read_batch_csums_file((char *) &file_flist_entry, sizeof(int)); + read_batch_csums_file( &file_flist_entry, sizeof(int)); if (file_flist_entry != flist_entry) { rprintf(FINFO, "file_list_entry NE flist_entry\n"); rprintf(FINFO, "file_flist_entry = %d flist_entry = %d\n", @@...

...rprintf(FERROR, "Batch file %s write error: %s\n", - rsync_csums_file, strerror(errno)); + filename, strerror(errno)); close(fdb); exit_cleanup(1); } } -void close_batch_csums_file() +void close_batch_csums_file(void) { close(fdb); - } void write_batch_csum_info(int *flist_entry, int flist_count, @@ -405,10 +405,7 @@ /* FIXME: This will break if s->count is ever not exactly an int. */ write_batch_csums_file(flist_entry, sizeof(int)); - if (s) - write_batch_csums_file(&s->count, sizeof(int)); - else - write_batch_csums_file(&int_zero, sizeof (int)); +...

...st=0x3, local_name=0x3 <Address 0x3 out of bounds>) at receiver.c:438 #98 0x08050e43 in msleep (t=3) at util.c:1000 #99 0x080514c1 in show_malloc_stats () at main.c:194 #100 0x08062628 in write_batch_flist_info (flist_count=3, files=0x3) at batch.c:43 #101 0x08062d35 in write_batch_csum_info (flist_entry=0x3, s=0x3) at batch.c:202 #102 0x0805d2be in read_longint (f=873) at io.c:710 #103 0x08062f73 in read_batch_csum_info (flist_entry=0, s=0x0, checksums_match=0x1) at batch.c:256 #104 0x0805219b in do_server_recv (f_in=0, f_out=0, argc=1501700484, argv=0x2a2514bc) at main.c:518 #105 0x2a287cf9 in ??...

...===================== RCS file: /cvsroot/rsync/batch.c,v retrieving revision 1.32 diff -c -b -d -r1.32 batch.c *** a/batch.c 15 May 2004 19:31:10 -0000 1.32 --- b/batch.c 17 Jun 2004 04:01:54 -0000 *************** *** 172,177 **** --- 172,178 ---- /** * Write csum info to batch file + * 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_...

Greetings, here is the output of the 'configure' step and the compile step (using the Compaq cc compiler that comes with Tru64 V5.1A. The configure reported success and most of the compile steps cam through error/warning free except for the one that stumbled. Can someone help me out here? I am willing to provide a binary for Tru64 V5.1A if we can swat this bug. We depend greatly on Rsync

> 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.

...nt; extern int csum_length; fdb_open = 1; /* Write csum info to batch file */ - /* FIXME: This will break if s->count is ever not exactly an int. */ + /* FIXME: This will break if s->count is ever greater than 2^32 + -1 */ write_batch_csums_file(flist_entry, sizeof(int)); - write_batch_csums_file(s ? &s->count : &int_zero, sizeof(int)); + int_count = s ? (unsigned int) s->count : 0; + write_batch_csums_file(&int_count, sizeof(int_count)); if (s) { for (i = 0; i < s->count; i++) {

...********** *** 25,30 **** --- 25,31 ---- void write_batch_flist_info(int flist_count, struct file_struct **files) { + return; char filename[MAXPATHLEN]; int i, f, save_pv; int64 save_written; *************** *** 180,185 **** --- 181,187 ---- **/ void write_batch_csum_info(int *flist_entry, struct sum_struct *s) { + return; size_t i; int int_count; char filename[MAXPATHLEN]; *************** *** 270,275 **** --- 272,278 ---- void write_batch_delta_file(char *buff, int bytes_to_write) { + return; char filename[MAXPATHLEN]; if (f_delta < 0) { Index: clien...