X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/398612ba07574d84e51380513c7c3424ac84eef0..434764269cc3f5bc2fc62f3789ff9d23a562d2d7:/generator.c

diff --git a/generator.c b/generator.c
index 40159f91..e9e145c8 100644
--- a/generator.c
+++ b/generator.c
@@ -712,7 +712,6 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode)
 		 || !unchanged_attrs(file, &st))
 			continue;
-#ifdef CAN_HARDLINK_SYMLINK
 		if (S_ISLNK(file->mode)) {
 #ifdef SUPPORT_LINKS
 			char lnk[MAXPATHLEN];
@@ -723,13 +722,26 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			if (strcmp(lnk, file->u.link) != 0)
 #endif
 				continue;
-		} else
+		} else if (IS_SPECIAL(file->mode)) {
+			if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev)
+				continue;
+		} else if (IS_DEVICE(file->mode)) {
+			if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
+				continue;
+		} else {
+			rprintf(FERROR,
+				"internal: try_dests_non() called with invalid mode (%o)\n",
+				file->mode);
+			exit_cleanup(RERR_UNSUPPORTED);
+		}
+		if (link_dest
+#ifndef CAN_HARDLINK_SYMLINK
+		 && !S_ISLNK(file->mode)
 #endif
-		if (IS_DEVICE(st.st_mode) != IS_DEVICE(file->mode)
-		 || IS_SPECIAL(st.st_mode) != IS_SPECIAL(file->mode)
-		 || st.st_rdev != file->u.rdev)
-			continue;
-		if (link_dest) {
+#ifndef CAN_HARDLINK_SPECIAL
+		 && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
+#endif
+		) {
 			if (do_link(fnamebuf, fname) < 0) {
 				rsyserr(FERROR, errno,
 					"failed to hard-link %s with %s",
@@ -964,15 +976,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				return;
 			if (!S_ISLNK(st.st_mode))
 				statret = -1;
-#ifdef CAN_HARDLINK_SYMLINK
 		} else if (basis_dir[0] != NULL) {
 			if (try_dests_non(file, fname, ndx, itemizing,
 					  maybe_ATTRS_REPORT, code) == -2) {
+#ifndef CAN_HARDLINK_SYMLINK
+				if (link_dest) {
+					/* Resort to --copy-dest behavior. */
+				} else
+#endif
 				if (!copy_dest)
 					return;
 				itemizing = code = 0;
 			}
-#endif
 		}
 		if (preserve_hard_links && file->link_u.links
 		    && hard_link_check(file, ndx, fname, -1, &st,
@@ -1005,16 +1020,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
 	 || (preserve_specials && IS_SPECIAL(file->mode))) {
-#ifdef CAN_HARDLINK_SPECIAL
 		if (statret != 0 && basis_dir[0] != NULL) {
 			if (try_dests_non(file, fname, ndx, itemizing,
 					  maybe_ATTRS_REPORT, code) == -2) {
+#ifndef CAN_HARDLINK_SPECIAL
+				if (link_dest) {
+					/* Resort to --copy-dest behavior. */
+				} else
+#endif
 				if (!copy_dest)
 					return;
 				itemizing = code = 0;
 			}
 		}
-#endif
 		if (statret != 0
 		 || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
 		 || st.st_rdev != file->u.rdev) {