X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6f1c2aab4398d37ddb4686f42ef8568eb0a510b0..01d124d9e251317cdd9f12fb170a94e65f3c5e18:/generator.c

diff --git a/generator.c b/generator.c
index 1860b0d1..c11672f5 100644
--- a/generator.c
+++ b/generator.c
@@ -50,8 +50,6 @@ extern int delete_before;
 extern int delete_during;
 extern int delete_after;
 extern int module_id;
-extern int sanitize_paths;
-extern int startdir_depth;
 extern int ignore_errors;
 extern int remove_sent_files;
 extern int delay_updates;
@@ -659,8 +657,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 			match_level = 0;
 	}
 
-#ifdef HAVE_LINK
 	if (match_level == 3 && !copy_dest) {
+#ifdef SUPPORT_HARD_LINKS
 		if (link_dest) {
 			if (hard_link_one(file, ndx, fname, 0, stp,
 					  cmpbuf, 1,
@@ -669,7 +667,9 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 				goto try_a_copy;
 			if (preserve_hard_links && file->link_u.links)
 				hard_link_cluster(file, ndx, itemizing, code);
-		} else if (itemizing)
+		} else
+#endif
+		if (itemizing)
 			itemize(file, ndx, 0, stp, 0, 0, NULL);
 		if (verbose > 1 && maybe_ATTRS_REPORT) {
 			code = daemon_log_format_has_i || dry_run
@@ -678,7 +678,6 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		}
 		return -2;
 	}
-#endif
 
 	if (match_level >= 2) {
 	  try_a_copy: /* Copy the file locally. */
@@ -742,9 +741,10 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		} else {
 			rprintf(FERROR,
 				"internal: try_dests_non() called with invalid mode (%o)\n",
-				file->mode);
+				(int)file->mode);
 			exit_cleanup(RERR_UNSUPPORTED);
 		}
+#ifdef SUPPORT_HARD_LINKS
 		if (link_dest
 #ifndef CAN_HARDLINK_SYMLINK
 		 && !S_ISLNK(file->mode)
@@ -762,6 +762,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			if (preserve_hard_links && file->link_u.links)
 				hard_link_cluster(file, ndx, itemizing, code);
 		}
+#endif
 		if (itemizing && log_format_has_i && verbose > 1) {
 			int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
 				    + (link_dest ? ITEM_XNAME_FOLLOWS : 0);
@@ -859,7 +860,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		char *dn = file->dirname ? file->dirname : ".";
 		if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
 			if (relative_paths && !implied_dirs
-			 && do_stat(dn, &st) < 0
+			 && safe_stat(dn, &st) < 0
 			 && create_directory_path(fname) < 0) {
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",
@@ -955,10 +956,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 			return;
 		}
-		if (sanitize_paths) {
-			sanitize_path(file->u.link, file->u.link, "",
-				      startdir_depth + file->dir.depth - 1);
-		}
 		if (statret == 0) {
 			char lnk[MAXPATHLEN];
 			int len;