From: Wayne Davison <wayned@samba.org>
Date: Wed, 2 Mar 2005 09:51:54 +0000 (+0000)
Subject: If the multi-dest loop falls back to the best_match index,
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/9ba463435b73b741b3a028589daf6372985eb8e2

If the multi-dest loop falls back to the best_match index,
we need to re-stat() the file to restore "st".
---

diff --git a/generator.c b/generator.c
index bd8a672e..788e2e6a 100644
--- a/generator.c
+++ b/generator.c
@@ -844,10 +844,15 @@ static void recv_generator(char *fname, struct file_list *flist,
 			break;
 		} while (basis_dir[++i] != NULL);
 		if (match_level) {
+			statret = 0;
 			if (i != best_match) {
 				i = best_match;
 				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
 					 basis_dir[i], fname);
+				if (link_stat(fnamecmpbuf, &st, 0) < 0) {
+					match_level = 0;
+					statret = -1;
+				}
 			}
 #ifdef HAVE_LINK
 			if (link_dest && match_level == 3 && !dry_run) {
@@ -863,11 +868,10 @@ static void recv_generator(char *fname, struct file_list *flist,
 				}
 			} else
 #endif
-			{
+			if (statret == 0) {
 				fnamecmp = fnamecmpbuf;
 				fnamecmp_type = i;
 			}
-			statret = 0;
 		}
 	}