Attachment 1781 Details for Bug 3596 – Fixes the bug by running directory retouching even when there's a local name

[patch] Fixes the bug by running directory retouching even when there's a local name

bug-3596.diff (text/plain), 1.00 KB, created by Matt McCutchen on 2006-03-09 22:49:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt McCutchen

Created: 2006-03-09 22:49:33 UTC

Size: 1.00 KB

patch

obsolete

>Index: generator.c
>===================================================================
>RCS file: /cvsroot/rsync/generator.c,v
>retrieving revision 1.264
>diff -u -r1.264 generator.c
>--- generator.c	24 Feb 2006 16:43:44 -0000	1.264
>+++ generator.c	10 Mar 2006 04:47:59 -0000
>@@ -1441,7 +1441,7 @@
> 		do_delete_pass(flist);
> 
> 	if ((need_retouch_dir_perms || need_retouch_dir_times)
>-	    && !list_only && !local_name && !dry_run) {
>+	    && !list_only && !dry_run) {
> 		int j = 0;
> 		/* Now we need to fix any directory permissions that were
> 		 * modified during the transfer and/or re-set any tweaked
>@@ -1453,7 +1453,11 @@
> 				continue;
> 			if (!need_retouch_dir_times && file->mode & S_IWUSR)
> 				continue;
>-			recv_generator(f_name(file, NULL), file, i, itemizing,
>+			if (local_name)
>+				strlcpy(fbuf, local_name, sizeof fbuf);
>+			else
>+				f_name(file, fbuf);
>+			recv_generator(fbuf, file, i, itemizing,
> 				       maybe_ATTRS_REPORT, code, -1);
> 			if (allowed_lull && !(++j % lull_mod))
> 				maybe_send_keepalive();

Actions: View

Attachments on bug 3596: 1781