search for: write_batch_delta_file

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

...+ write_batch_csums_file( &s->sums[i].sum1, sizeof(uint32)); if ((*flist_entry == flist_count - 1) && (i == s->count - 1)) { @@ -486,7 +487,7 @@ } -void write_batch_delta_file(char *buff, int bytes_to_write) +void write_batch_delta_file(const void *buff, int bytes_to_write) { static int fdb_delta_open = 1; @@ -516,13 +517,13 @@ exit_cleanup(1); } } -void close_batch_delta_file() +void close_batch_delta_file(void) { close...

...read_batch_csums_file((char *) &file_sum1, + read_batch_csums_file( &file_sum1, sizeof(uint32)); read_batch_csums_file(file_sum2, csum_length); @@ -498,7 +499,7 @@ } -void write_batch_delta_file(char *buff, int bytes_to_write) +void write_batch_delta_file(const void *buff, int bytes_to_write) { static int fdb_delta_open = 1; @@ -528,13 +529,13 @@ exit_cleanup(1); } } -void close_batch_delta_file() +void close_batch_delta_file(void) { close...

...nder && argc == 0) { list_only = 1; } *************** *** 1028,1033 **** --- 1029,1038 ---- if (write_batch && !am_server) { write_batch_argvs_file(orig_argc, orig_argv); + /* initialize static fds */ + ret = -1; + write_batch_csum_info(&ret, NULL); + write_batch_delta_file(NULL, 0); } if (am_daemon && !am_server) Index: options.c =================================================================== RCS file: /cvsroot/rsync/options.c,v retrieving revision 1.156 diff -c -b -d -r1.156 options.c *** a/options.c 7 Jun 2004 22:05:22 -0000 1.156 --- b/options...

...ET#>simple_send_token will do write_buf(f,map_ptr(buf,%.0f+l,%.0f),%.0f)\n",(double)offset,(double)n1,(double)n1); + map_ptr(buf,offset+l,n1); + if (buf->m_len==0) + break; + write_int(f,buf->m_len); + write_buf(f,buf->m_ptr,buf->m_len); 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(buf->m_ptr,buf->m_len); } - l += n1; - } + l += buf->m_len; + + }; } /* a -2 token means to send data only and no token */ if (token != -2) {...

I'm in the midst of coding a patch set for consideration that will bump the protocol version and have a couple of observations. The current minimum backwards-compatible protocol is 15 but we have code that checks for protocol versions as old as 12. If someone else doesn't beat me to it i'm considering cleaning out the pre-15 compatibility code. A backwards compatibility patch could

...m2, csum_length); if ((s->sums[i].sum1 != file_sum1) || - (memcmp - (s->sums[i].sum2, file_sum2, - csum_length) != 0)) { + (memcmp(s->sums[i].sum2, file_sum2, csum_length) + != 0)) { *checksums_match = 0; } } /* end for */ } - } void write_batch_delta_file(char *buff, int bytes_to_write) { static int fdb_delta_open = 1; + char filename[MAXPATHLEN]; if (fdb_delta_open) { /* Set up file extension */ - strcat(rsync_delta_file, batch_file_ext); + strlcpy(filename, batch_prefix, sizeof(filename)); + strlcat(filename, rsync_delta_file, sizeof(...

...= i; @@ -74,7 +87,7 @@ if (i == (int) s->count-1 && s->remainder != 0) { s->sums[i].len = s->remainder; } else { - s->sums[i].len = s->n; + s->sums[i].len = s->blength; } offset += s->sums[i].len; @@ -211,9 +224,7 @@ if (write_batch) write_batch_delta_file((char *)&i,sizeof(i)); - write_int(f_out,s->count); - write_int(f_out,s->n); - write_int(f_out,s->remainder); + write_sum_head(f_out, s); } if (verbose > 2) @@ -240,9 +251,7 @@ } else { wr...

...= i; @@ -74,7 +87,7 @@ if (i == (int) s->count-1 && s->remainder != 0) { s->sums[i].len = s->remainder; } else { - s->sums[i].len = s->n; + s->sums[i].len = s->blength; } offset += s->sums[i].len; @@ -211,9 +224,7 @@ if (write_batch) write_batch_delta_file((char *)&i,sizeof(i)); - write_int(f_out,s->count); - write_int(f_out,s->n); - write_int(f_out,s->remainder); + write_sum_head(f_out, s); } if (verbose > 2) @@ -240,9 +251,7 @@ } else { wr...

...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: clientserver.c =================================================================== RCS file: /cvsroot/rsync/clientserver.c,v retrieving revision 1.127 diff -c -b -d -r1.127 clientserver.c...