From: Wayne Davison <wayned@samba.org>
Date: Sat, 19 Jan 2013 17:52:56 +0000 (-0800)
Subject: Further improve non-empty-destination --link-dest behavior:
X-Git-Tag: v3.1.0pre1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c03bb3d181b300a30a45e043d5aa075af5e8e3f8;p=thirdparty%2Frsync.git

Further improve non-empty-destination --link-dest behavior:
- Avoid relinking a file that is already linked correctly.
- Avoid trashing the stat buffer of an existing file in try_dests_reg().
---

diff --git a/generator.c b/generator.c
index e7bb90a4..314122c3 100644
--- a/generator.c
+++ b/generator.c
@@ -852,6 +852,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 			 char *cmpbuf, stat_x *sxp, int find_exact_for_existing,
 			 int itemizing, enum logcode code)
 {
+	STRUCT_STAT real_st = sxp->st;
 	int best_match = -1;
 	int match_level = 0;
 	int j = 0;
@@ -893,8 +894,12 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 
 	if (match_level == 3 && !copy_dest) {
 		if (find_exact_for_existing) {
-			if (do_unlink(fname) < 0 && errno != ENOENT)
+			if (link_dest && real_st.st_dev == sxp->st.st_dev && real_st.st_ino == sxp->st.st_ino)
 				return -1;
+			if (do_unlink(fname) < 0 && errno != ENOENT) {
+				sxp->st = real_st;
+				return -1;
+			}
 		}
 #ifdef SUPPORT_HARD_LINKS
 		if (link_dest) {
@@ -918,15 +923,20 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		return -2;
 	}
 
-	if (find_exact_for_existing)
+	if (find_exact_for_existing) {
+		sxp->st = real_st;
 		return -1;
+	}
 
 	if (match_level >= 2) {
 #ifdef SUPPORT_HARD_LINKS
 	  try_a_copy: /* Copy the file locally. */
 #endif
-		if (!dry_run && copy_altdest_file(cmpbuf, fname, file) < 0)
+		if (!dry_run && copy_altdest_file(cmpbuf, fname, file) < 0) {
+			if (find_exact_for_existing) /* Can get here via hard-link failure */
+				sxp->st = real_st;
 			return -1;
+		}
 		if (itemizing)
 			itemize(cmpbuf, file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
 		if (maybe_ATTRS_REPORT