From: Wayne Davison <wayned@samba.org>
Date: Sun, 10 Feb 2008 05:41:50 +0000 (-0800)
Subject: Improved the "symlink has no referent" logic to work with all the
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/21897ecbedeec3fbcaf2cbed895df6d11d811ba9

Improved the "symlink has no referent" logic to work with all the
--copy*links options.
---

diff --git a/flist.c b/flist.c
index 3616a8e2..a0970216 100644
--- a/flist.c
+++ b/flist.c
@@ -1037,9 +1037,15 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 		}
 		if (save_errno == ENOENT) {
 #ifdef SUPPORT_LINKS
-			/* Avoid "vanished" error if symlink points nowhere. */
-			if (copy_links && x_lstat(thisname, &st, NULL) == 0
-			    && S_ISLNK(st.st_mode)) {
+			/* When our options tell us to follow a symlink that
+			 * points nowhere, tell the user about the symlink
+			 * instead of giving a "vanished" message.  We only
+			 * dereference a symlink if one of the --copy*links
+			 * options was specified, so there's no need for the
+			 * extra lstat() if one of these options isn't on. */
+			if ((copy_links || copy_unsafe_links || copy_dirlinks)
+			 && x_lstat(thisname, &st, NULL) == 0
+			 && S_ISLNK(st.st_mode)) {
 				io_error |= IOERR_GENERAL;
 				rprintf(FERROR_XFER, "symlink has no referent: %s\n",
 					full_fname(thisname));