search for: log_send

...-r1.40 sender.c *** a/sender.c 15 May 2004 19:31:10 -0000 1.40 --- b/sender.c 17 Jun 2004 04:01:58 -0000 *************** *** 278,284 **** rprintf (FINFO, "filename=%s is being skipped\n", fname); continue; } ! } else { match_sums(f_out, s, mbuf, st.st_size); log_send(file, &initial_stats); } --- 278,284 ---- rprintf (FINFO, "filename=%s is being skipped\n", fname); continue; } ! } else { /* not read_batch */ match_sums(f_out, s, mbuf, st.st_size); log_send(file, &initial_stats); } Index: token.c ==========...

As I reported a while back rsync doesn't handle metadata (permissions and ownership) in dryrun mode. I offered to make a patch and that offer still stands. I didn't have the time for it until now and want to pick it up again. I had some ugly hack back then but I want to redo it in a clean way. I would like some input on my thoughts. IMHO, it would be ideally if the check for dry_run

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

...ite_sum_head(f_out, s); + write_int(f_alt, i); + write_sum_head(f_alt, s); if (verbose > 2) { rprintf(FINFO, "calling match_sums %s\n", @@ -237,7 +251,7 @@ set_compression(fname); - match_sums(f_out, s, mbuf, st.st_size); + match_sums(f_alt, s, mbuf, st.st_size); log_send(file, &initial_stats); if (mbuf) { Index: rsync-2.6.3/options.c =================================================================== --- rsync-2.6.3.orig/options.c 2005-03-18 17:19:30.%N -0800 +++ rsync-2.6.3/options.c 2005-03-19 12:45:22.%N -0800 @@ -113,6 +113,7 @@ int write_batch = 0;...

...(read_devices && (S_ISFIFO(st.st_mode) || S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode))) { + /* For FIFO and device files know the file size only now -- update stats. */ + stats.total_size += buf->file_size; + initial_stats.total_size += buf->file_size; + } log_send(file, &initial_stats); } if (!read_batch) { /* dw */ diff -r -u4 rsync-2.5.5/token.c rsync-patched/token.c --- rsync-2.5.5/token.c Tue Aug 14 05:04:49 2001 +++ rsync-patched/token.c Mon Aug 5 10:05:15 2002 @@ -85,27 +85,32 @@ return n; } -/* non-compressing send to...