X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/45c49b52a488882bbbd5366420389abbbeede7c9..d051056f921f465c487a85f9fa29a2324332bc4b:/hlink.c

diff --git a/hlink.c b/hlink.c
index f4fa9fcb..2babcece 100644
--- a/hlink.c
+++ b/hlink.c
@@ -20,7 +20,6 @@
 
 #include "rsync.h"
 
-extern int dry_run;
 extern int verbose;
 extern int link_dest;
 extern int make_backups;
@@ -181,11 +180,13 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		head = hlink_list[file->F_HLINDEX];
 	if (ndx != head) {
 		struct file_struct *head_file = FPTR(head);
-		if (!log_format_has_i && verbose > 1)
-			rprintf(FINFO, "\"%s\" is a hard link\n", f_name(file));
+		if (!log_format_has_i && verbose > 1) {
+			rprintf(FINFO, "\"%s\" is a hard link\n",
+				f_name(file, NULL));
+		}
 		if (head_file->F_HLINDEX == FINISHED_LINK) {
 			STRUCT_STAT st2, st3;
-			char *toname = f_name(head_file);
+			char *toname = f_name(head_file, NULL);
 			if (link_stat(toname, &st2, 0) < 0) {
 				rsyserr(FERROR, errno, "stat %s failed",
 					full_fname(toname));
@@ -266,7 +267,7 @@ void hard_link_cluster(struct file_struct *file, int master, int itemizing,
 	int statret, ndx = master;
 
 	file->F_HLINDEX = FINISHED_LINK;
-	if (link_stat(f_name_to(file, hlink1), &st1, 0) < 0)
+	if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
 		return;
 	if (!(file->flags & FLAG_HLINK_TOL)) {
 		while (!(file->flags & FLAG_HLINK_EOL)) {
@@ -279,7 +280,7 @@ void hard_link_cluster(struct file_struct *file, int master, int itemizing,
 		file = FPTR(ndx);
 		if (file->F_HLINDEX != SKIPPED_LINK)
 			continue;
-		hlink2 = f_name(file);
+		hlink2 = f_name(file, NULL);
 		statret = link_stat(hlink2, &st2, 0);
 		maybe_hard_link(file, ndx, hlink2, statret, &st2,
 				hlink1, &st1, itemizing, code);