X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a9cc1283089c07f87e986cf3837c096c3f8462c7..5f93b4d35ecadf57ddb87a11eda25e7d082137d7:/generator.c

diff --git a/generator.c b/generator.c
index c0e876a3..3eef9e58 100644
--- a/generator.c
+++ b/generator.c
@@ -27,7 +27,6 @@ extern int verbose;
 extern int dry_run;
 extern int do_xfers;
 extern int log_format_has_i;
-extern int log_format_has_o_or_i;
 extern int daemon_log_format_has_i;
 extern int am_root;
 extern int am_server;
@@ -81,7 +80,6 @@ extern int link_dest;
 extern int whole_file;
 extern int list_only;
 extern int read_batch;
-extern int orig_umask;
 extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
 extern int max_delete;
@@ -96,8 +94,6 @@ extern struct file_list *the_file_list;
 extern struct filter_list_struct server_filter_list;
 
 static int deletion_count = 0; /* used to implement --max-delete */
-static int can_link_symlinks = 1; /* start out optimistic */
-static int can_link_devices = 1;
 
 /* For calling delete_file() */
 #define DEL_FORCE_RECURSE	(1<<1) /* recurse even w/o --force */
@@ -704,34 +700,47 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 /* This is only called for non-regular files.  We return -2 if we've finished
  * 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_ATTRS_REPORT, enum logcode code)
+			 int itemizing, int maybe_ATTRS_REPORT,
+			 enum logcode code)
 {
-	char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
+	char fnamebuf[MAXPATHLEN];
 	STRUCT_STAT st;
-	int len, i = 0;
+	int i = 0;
 
 	do {
 		pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname);
 		if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode)
 		 || !unchanged_attrs(file, &st))
 			continue;
-		if (S_ISLNK(file->mode)) {
+		if (IS_DEVICE(file->mode)) {
+			if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
+				continue;
+		} else if (IS_SPECIAL(file->mode)) {
+			if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev)
+				continue;
+#ifdef CAN_HARDLINK_SYMLINK
+		} else if (S_ISLNK(file->mode)) {
 #ifdef SUPPORT_LINKS
+			char lnk[MAXPATHLEN];
+			int len;
 			if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
 				continue;
 			lnk[len] = '\0';
 			if (strcmp(lnk, file->u.link) != 0)
 #endif
 				continue;
+#endif
 		} else {
-			if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
-				continue;
+			rprintf(FERROR,
+				"internal: try_dests_non() called with invalid mode (%o)\n",
+				file->mode);
+			exit_cleanup(RERR_UNSUPPORTED);
 		}
 		if (link_dest) {
 			if (do_link(fnamebuf, fname) < 0) {
-				/* TODO improve this to be based on errno? */
-				*possible_ptr = 0;
+				rsyserr(FERROR, errno,
+					"failed to hard-link %s with %s",
+					fnamebuf, fname);
 				break;
 			}
 			if (preserve_hard_links && file->link_u.links)
@@ -773,6 +782,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	static int missing_below = -1, excluded_below = -1;
 	static char *parent_dirname = "";
 	static struct file_list *fuzzy_dirlist = NULL;
+	static int need_fuzzy_dirlist = 0;
 	struct file_struct *fuzzy_file = NULL;
 	int fd = -1, f_copy = -1;
 	STRUCT_STAT st, real_st, partial_st;
@@ -790,12 +800,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (fuzzy_dirlist) {
 			flist_free(fuzzy_dirlist);
 			fuzzy_dirlist = NULL;
-			parent_dirname = "";
 		}
 		if (missing_below >= 0) {
 			dry_run--;
 			missing_below = -1;
 		}
+		parent_dirname = "";
 		return;
 	}
 
@@ -830,18 +840,27 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		statret = -1;
 		stat_errno = ENOENT;
 	} else {
-		if (fuzzy_basis && S_ISREG(file->mode)) {
-			char *dn = file->dirname ? file->dirname : ".";
-			if (parent_dirname != dn
-			    && strcmp(parent_dirname, dn) != 0) {
-				if (fuzzy_dirlist)
-					flist_free(fuzzy_dirlist);
-				if (implied_dirs || stat(dn, &st) == 0)
-					fuzzy_dirlist = get_dirlist(dn, -1, 1);
-				else
-					fuzzy_dirlist = NULL;
+		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
+			 && create_directory_path(fname) < 0) {
+				rsyserr(FERROR, errno,
+					"recv_generator: mkdir %s failed",
+					full_fname(dn));
 			}
-			parent_dirname = dn;
+			if (fuzzy_dirlist) {
+				flist_free(fuzzy_dirlist);
+				fuzzy_dirlist = NULL;
+			}
+			if (fuzzy_basis)
+				need_fuzzy_dirlist = 1;
+		}
+		parent_dirname = dn;
+
+		if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
+			fuzzy_dirlist = get_dirlist(dn, -1, 1);
+			need_fuzzy_dirlist = 0;
 		}
 
 		statret = link_stat(fname, &st,
@@ -887,7 +906,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
 			if (!relative_paths || errno != ENOENT
-			    || create_directory_path(fname, orig_umask) < 0
+			    || create_directory_path(fname) < 0
 			    || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",
@@ -952,14 +971,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				return;
 			if (!S_ISLNK(st.st_mode))
 				statret = -1;
-		} else if (basis_dir[0] != NULL && can_link_symlinks) {
+#ifdef CAN_HARDLINK_SYMLINK
+		} else if (basis_dir[0] != NULL) {
 			if (try_dests_non(file, fname, ndx, itemizing,
-					  &can_link_symlinks,
 					  maybe_ATTRS_REPORT, code) == -2) {
 				if (!copy_dest)
 					return;
 				itemizing = code = 0;
 			}
+#endif
 		}
 		if (preserve_hard_links && file->link_u.links
 		    && hard_link_check(file, ndx, fname, -1, &st,
@@ -992,16 +1012,16 @@ 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))) {
-		if (statret != 0
-		 && (basis_dir[0] != NULL && can_link_devices)) {
+#ifdef CAN_HARDLINK_SPECIAL
+		if (statret != 0 && basis_dir[0] != NULL) {
 			if (try_dests_non(file, fname, ndx, itemizing,
-					  &can_link_devices,
 					  maybe_ATTRS_REPORT, code) == -2) {
 				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) {
@@ -1291,6 +1311,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	int save_ignore_non_existing = ignore_non_existing;
 	int save_do_progress = do_progress;
 	int save_make_backups = make_backups;
+	int dir_tweaking = !(list_only || local_name || dry_run);
 
 	if (protocol_version >= 29) {
 		itemizing = 1;
@@ -1352,7 +1373,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		 * them.  This is then fixed after the transfer is done. */
 #ifdef HAVE_CHMOD
 		if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
-		    && !list_only) {
+		 && dir_tweaking) {
 			mode_t mode = file->mode | S_IWUSR; /* user write */
 			char *fname = local_name ? local_name : fbuf;
 			if (do_chmod(fname, mode) < 0) {
@@ -1432,8 +1453,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	if (delete_after && !local_name && flist->count > 0)
 		do_delete_pass(flist);
 
-	if ((need_retouch_dir_perms || need_retouch_dir_times)
-	    && !list_only && !local_name && !dry_run) {
+	if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) {
 		int j = 0;
 		/* Now we need to fix any directory permissions that were
 		 * modified during the transfer and/or re-set any tweaked