From: Wayne Davison <wayned@samba.org>
Date: Sat, 11 Apr 2009 13:32:25 +0000 (-0700)
Subject: Fix "just in case" unlink.  Prefer renaming of normal files
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/5e2d51ee0675dc39d89c9ec11297a33c12b9181d

Fix "just in case" unlink.  Prefer renaming of normal files
if hard-linking fails.
---

diff --git a/backup.c b/backup.c
index ed99ee93..5f860f78 100644
--- a/backup.c
+++ b/backup.c
@@ -155,18 +155,18 @@ static inline int link_or_rename(const char *from, const char *to,
 		if (IS_SPECIAL(stp->st_mode) || IS_DEVICE(stp->st_mode))
 			return 0; /* Use copy code. */
 #endif
-		if (!S_ISDIR(stp->st_mode)) {
-			if (do_link(from, to) == 0)
-				return 2;
+		if (do_link(from, to) == 0)
+			return 2;
+		/* We prefer to rename a regular file rather than copy it. */
+		if (!S_ISREG(stp->st_mode) || errno == EEXIST || errno == EISDIR)
 			return 0;
-		}
 	}
 #endif
 	if (do_rename(from, to) == 0) {
 		if (stp->st_nlink > 1 && !S_ISDIR(stp->st_mode)) {
 			/* If someone has hard-linked the file into the backup
 			 * dir, rename() might return success but do nothing! */
-			robust_unlink(to); /* Just in case... */
+			robust_unlink(from); /* Just in case... */
 		}
 		return 1;
 	}