X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/48224e4c43cfaa0d426bae413a4ebca144489bdc..5e4ff5f9c58c2b84ef32d43e542a8fa12b64bc65:/generator.c

diff --git a/generator.c b/generator.c
index 52f37608..82040c1a 100644
--- a/generator.c
+++ b/generator.c
@@ -236,7 +236,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 	}
 
 	if (verbose > 2)
-		rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf));
+		rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
 
 	if (allowed_lull)
 		maybe_send_keepalive();
@@ -308,7 +308,7 @@ static void do_delete_pass(struct file_list *flist)
 
 		f_name_to(file, fbuf);
 		if (verbose > 1 && file->flags & FLAG_TOP_DIR)
-			rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
+			rprintf(FINFO, "deleting in %s\n", fbuf);
 
 		delete_in_dir(flist, fbuf, file);
 	}
@@ -658,19 +658,14 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 					  itemizing && verbose > 1,
 					  code) < 0)
 				goto try_a_copy;
-			if (preserve_hard_links
-			    && file->link_u.links) {
-				hard_link_cluster(file, ndx,
-						  itemizing,
-						  code);
-			}
+			if (preserve_hard_links && file->link_u.links)
+				hard_link_cluster(file, ndx, itemizing, code);
 		} else if (itemizing)
 			itemize(file, ndx, 0, stp, 0, 0, NULL);
 		if (verbose > 1 && maybe_PERMS_REPORT) {
 			code = daemon_log_format_has_i || dry_run
 			     ? FCLIENT : FINFO;
-			rprintf(code, "%s is uptodate\n",
-				safe_fname(fname));
+			rprintf(code, "%s is uptodate\n", fname);
 		}
 		return -2;
 	}
@@ -680,30 +675,24 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 	  try_a_copy: /* Copy the file locally. */
 		if (copy_file(cmpbuf, fname, file->mode) < 0) {
 			if (verbose) {
-				rsyserr(FINFO, errno,
-					"copy_file %s => %s",
-					full_fname(cmpbuf),
-					safe_fname(fname));
+				rsyserr(FINFO, errno, "copy_file %s => %s",
+					full_fname(cmpbuf), fname);
 			}
 			return -1;
 		}
-		if (itemizing) {
-			itemize(file, ndx, 0, stp,
-				ITEM_LOCAL_CHANGE, 0, NULL);
-		}
+		if (itemizing)
+			itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
 		set_perms(fname, file, NULL, 0);
 		if (maybe_PERMS_REPORT
 		 && ((!itemizing && verbose && match_level == 2)
 		  || (verbose > 1 && match_level == 3))) {
 			code = daemon_log_format_has_i || dry_run
 			     ? FCLIENT : FINFO;
-			rprintf(code, "%s%s\n", safe_fname(fname),
+			rprintf(code, "%s%s\n", fname,
 				match_level == 3 ? " is uptodate" : "");
 		}
-		if (preserve_hard_links && file->link_u.links) {
-			hard_link_cluster(file, ndx,
-					  itemizing, code);
-		}
+		if (preserve_hard_links && file->link_u.links)
+			hard_link_cluster(file, ndx, itemizing, code);
 		return -2;
 	}
 
@@ -714,7 +703,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
  * handling the file, or -1 if no dest-linking occurred. */
 static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			 int itemizing, int *possible_ptr,
-			 int maybe_PERMS_REPORT)
+			 int maybe_PERMS_REPORT, enum logcode code)
 {
 	char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
 	STRUCT_STAT st;
@@ -741,6 +730,8 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 				*possible_ptr = 0;
 				break;
 			}
+			if (preserve_hard_links && file->link_u.links)
+				hard_link_cluster(file, ndx, itemizing, code);
 		}
 		if (itemizing && log_format_has_i && verbose > 1) {
 			int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
@@ -749,10 +740,9 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			itemize(file, ndx, 0, &st, changes, 0, lp);
 		}
 		if (verbose > 1 && maybe_PERMS_REPORT) {
-			enum logcode code = daemon_log_format_has_i || dry_run
-					  ? FCLIENT : FINFO;
-			rprintf(code, "%s is uptodate\n",
-				safe_fname(fname));
+			code = daemon_log_format_has_i || dry_run
+			     ? FCLIENT : FINFO;
+			rprintf(code, "%s is uptodate\n", fname);
 		}
 		return -2;
 	} while (basis_dir[++i] != NULL);
@@ -804,10 +794,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		return;
 	}
 
-	if (verbose > 2) {
-		rprintf(FINFO, "recv_generator(%s,%d)\n",
-			safe_fname(fname), ndx);
-	}
+	if (verbose > 2)
+		rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
 
 	if (server_filter_list.head) {
 		if (excluded_below >= 0) {
@@ -823,7 +811,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			if (verbose) {
 				rprintf(FINFO,
 					"skipping server-excluded file \"%s\"\n",
-					safe_fname(fname));
+					fname);
 			}
 			return;
 		}
@@ -857,7 +845,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (verbose > 1) {
 			rprintf(FINFO, "not creating new %s \"%s\"\n",
 				S_ISDIR(file->mode) ? "directory" : "file",
-				safe_fname(fname));
+				fname);
 		}
 		return;
 	}
@@ -901,7 +889,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		if (set_perms(fname, file, statret ? NULL : &st, 0)
 		    && verbose && code && f_out != -1)
-			rprintf(code, "%s/\n", safe_fname(fname));
+			rprintf(code, "%s/\n", fname);
 		if (delete_during && f_out != -1 && !phase && dry_run < 2
 		    && (file->flags & FLAG_DEL_HERE))
 			delete_in_dir(the_file_list, fname, file);
@@ -921,8 +909,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 					fname = f_name(file);
 				rprintf(FINFO,
 					"ignoring unsafe symlink %s -> \"%s\"\n",
-					full_fname(fname),
-					safe_fname(file->u.link));
+					full_fname(fname), file->u.link);
 			}
 			return;
 		}
@@ -961,7 +948,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		} else if (basis_dir[0] != NULL && can_link_symlinks) {
 			if (try_dests_non(file, fname, ndx, itemizing,
 					  &can_link_symlinks,
-					  maybe_PERMS_REPORT) == -2) {
+					  maybe_PERMS_REPORT, code) == -2) {
 				if (!copy_dest)
 					return;
 				itemizing = code = 0;
@@ -973,7 +960,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			return;
 		if (do_symlink(file->u.link,fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
-				full_fname(fname), safe_fname(file->u.link));
+				full_fname(fname), file->u.link);
 		} else {
 			set_perms(fname,file,NULL,0);
 			if (itemizing) {
@@ -981,8 +968,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 					ITEM_LOCAL_CHANGE, 0, NULL);
 			}
 			if (code && verbose) {
-				rprintf(code, "%s -> %s\n", safe_fname(fname),
-					safe_fname(file->u.link));
+				rprintf(code, "%s -> %s\n", fname,
+					file->u.link);
 			}
 			if (remove_sent_files && !dry_run) {
 				char numbuf[4];
@@ -1001,7 +988,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		 && (basis_dir[0] != NULL && can_link_devices)) {
 			if (try_dests_non(file, fname, ndx, itemizing,
 					  &can_link_devices,
-					  maybe_PERMS_REPORT) == -2) {
+					  maybe_PERMS_REPORT, code) == -2) {
 				if (!copy_dest)
 					return;
 				itemizing = code = 0;
@@ -1021,7 +1008,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				statret = -1;
 			if (verbose > 2) {
 				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-					safe_fname(fname),
+					fname,
 					(int)file->mode, (int)file->u.rdev);
 			}
 			if (do_mknod(fname,file->mode,file->u.rdev) < 0) {
@@ -1033,10 +1020,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 					itemize(file, ndx, statret, &st,
 						ITEM_LOCAL_CHANGE, 0, NULL);
 				}
-				if (code && verbose) {
-					rprintf(code, "%s\n",
-						safe_fname(fname));
-				}
+				if (code && verbose)
+					rprintf(code, "%s\n", fname);
 				if (preserve_hard_links && file->link_u.links) {
 					hard_link_cluster(file, ndx,
 							  itemizing, code);
@@ -1055,8 +1040,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	if (!S_ISREG(file->mode)) {
 		if (the_file_list->count == 1)
 			fname = f_name(file);
-		rprintf(FINFO, "skipping non-regular file \"%s\"\n",
-			safe_fname(fname));
+		rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
 		return;
 	}
 
@@ -1064,8 +1048,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (verbose > 1) {
 			if (the_file_list->count == 1)
 				fname = f_name(file);
-			rprintf(FINFO, "%s is over max-size\n",
-				safe_fname(fname));
+			rprintf(FINFO, "%s is over max-size\n", fname);
 		}
 		return;
 	}
@@ -1073,22 +1056,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (verbose > 1) {
 			if (the_file_list->count == 1)
 				fname = f_name(file);
-			rprintf(FINFO, "%s is under min-size\n",
-				safe_fname(fname));
+			rprintf(FINFO, "%s is under min-size\n", fname);
 		}
 		return;
 	}
 
 	if (ignore_existing && statret == 0) {
 		if (verbose > 1)
-			rprintf(FINFO, "%s exists\n", safe_fname(fname));
+			rprintf(FINFO, "%s exists\n", fname);
 		return;
 	}
 
 	if (update_only && statret == 0
 	    && cmp_modtime(st.st_mtime, file->modtime) > 0) {
 		if (verbose > 1)
-			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
+			rprintf(FINFO, "%s is newer\n", fname);
 		return;
 	}
 
@@ -1132,7 +1114,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			f_name_to(fuzzy_file, fnamecmpbuf);
 			if (verbose > 2) {
 				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
-					safe_fname(fname), safe_fname(fnamecmpbuf));
+					fname, fnamecmpbuf);
 			}
 			st.st_size = fuzzy_file->length;
 			statret = 0;
@@ -1237,7 +1219,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if (verbose > 3) {
 		rprintf(FINFO, "gen mapped %s of size %.0f\n",
-			safe_fname(fnamecmp), (double)st.st_size);
+			fnamecmp, (double)st.st_size);
 	}
 
 	if (verbose > 2)
@@ -1277,7 +1259,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		set_perms(backupptr, back_file, NULL, 0);
 		if (verbose > 1) {
 			rprintf(FINFO, "backed up %s to %s\n",
-				safe_fname(fname), safe_fname(backupptr));
+				fname, backupptr);
 		}
 		free(back_file);
 	}