X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/aef988258103ecded22b54d9a7132fd3d30ea565..70b54e4e4367aff38379f8dcb0f10755ef42f2ea:/generator.c

diff --git a/generator.c b/generator.c
index bd8a672e..fd4f9d55 100644
--- a/generator.c
+++ b/generator.c
@@ -844,30 +844,31 @@ 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) {
-				if (do_link(fnamecmpbuf, fname) < 0) {
-					if (verbose) {
-						rsyserr(FINFO, errno,
-							"link %s => %s",
-							full_fname(fnamecmpbuf),
-							safe_fname(fname));
-					}
-					fnamecmp = fnamecmpbuf;
-					fnamecmp_type = i;
+			if (link_dest && match_level == 3
+			    && do_link(fnamecmpbuf, fname) < 0) {
+				if (verbose) {
+					rsyserr(FINFO, errno, "link %s => %s",
+						full_fname(fnamecmpbuf),
+						safe_fname(fname));
 				}
-			} else
+				match_level = 1;
+			}
 #endif
-			{
+			if (match_level && match_level < 3) {
 				fnamecmp = fnamecmpbuf;
 				fnamecmp_type = i;
 			}
-			statret = 0;
 		}
 	}