X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b06050f9ad6657a41b5ca5f7e205e48ed6edb173..21068d8e87cfe777aed2735a3241084b313109ad:/generator.c

diff --git a/generator.c b/generator.c
index b36bc4d2..582ab797 100644
--- a/generator.c
+++ b/generator.c
@@ -78,6 +78,7 @@ extern int copy_dest;
 extern int link_dest;
 extern int whole_file;
 extern int list_only;
+extern int new_root_dir;
 extern int read_batch;
 extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
@@ -98,6 +99,9 @@ static int deletion_count = 0; /* used to implement --max-delete */
 #define DEL_FORCE_RECURSE	(1<<1) /* recurse even w/o --force */
 #define DEL_TERSE		(1<<3)
 
+enum nonregtype {
+    TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
+};
 
 static int is_backup_file(char *fn)
 {
@@ -342,8 +346,9 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 		if (S_ISREG(file->mode) && file->length != st->st_size)
 			iflags |= ITEM_REPORT_SIZE;
 		if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
-		     && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
-		    || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+		  && !(iflags & ITEM_MATCHED)
+		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+		 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
 			iflags |= ITEM_REPORT_TIME;
 		if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
 			iflags |= ITEM_REPORT_PERMS;
@@ -452,7 +457,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 		int64 l;
 		int b = BLOCKSUM_BIAS;
 		for (l = len; l >>= 1; b += 2) {}
-		for (c = blength; c >>= 1 && b; b--) {}
+		for (c = blength; (c >>= 1) && b; b--) {}
 		/* add a bit, subtract rollsum, round up. */
 		s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
 		s2length = MAX(s2length, csum_length);
@@ -646,19 +651,21 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		j = best_match;
 		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
 		if (link_stat(cmpbuf, stp, 0) < 0)
-			match_level = 0;
+			return -1;
 	}
 
 	if (match_level == 3 && !copy_dest) {
 #ifdef SUPPORT_HARD_LINKS
 		if (link_dest) {
+			int i = itemizing && (verbose > 1 || stdout_format_has_i > 1);
 			if (hard_link_one(file, ndx, fname, 0, stp,
-					  cmpbuf, 1,
-					  itemizing && verbose > 1,
-					  code) < 0)
+					  cmpbuf, 1, i, code) < 0)
 				goto try_a_copy;
-			if (preserve_hard_links && file->link_u.links)
+			if (preserve_hard_links && file->link_u.links) {
+				if (dry_run)
+					file->link_u.links->link_dest_used = j + 1;
 				hard_link_cluster(file, ndx, itemizing, code);
+			}
 		} else
 #endif
 		if (itemizing)
@@ -697,42 +704,107 @@ 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. */
+ * handling the file, or -1 if no dest-linking occurred, or a non-negative
+ * value if we found an alternate basis file. */
 static int try_dests_non(struct file_struct *file, char *fname, int ndx,
-			 int itemizing, int maybe_ATTRS_REPORT,
-			 enum logcode code)
+			 char *cmpbuf, STRUCT_STAT *stp, int itemizing,
+			 int maybe_ATTRS_REPORT, enum logcode code)
 {
-	char fnamebuf[MAXPATHLEN];
-	STRUCT_STAT st;
-	int i = 0;
+	char lnk[MAXPATHLEN];
+	int best_match = -1;
+	int match_level = 0;
+	enum nonregtype type;
+	int len, j = 0;
+
+#ifndef SUPPORT_LINKS
+	if (S_ISLNK(file->mode))
+		return -1;
+#endif
+	if (S_ISDIR(file->mode)) {
+		type = TYPE_DIR;
+	} else if (IS_SPECIAL(file->mode))
+		type = TYPE_SPECIAL;
+	else if (IS_DEVICE(file->mode))
+		type = TYPE_DEVICE;
+#ifdef SUPPORT_LINKS
+	else if (S_ISLNK(file->mode))
+		type = TYPE_SYMLINK;
+#endif
+	else {
+		rprintf(FERROR,
+			"internal: try_dests_non() called with invalid mode (%o)\n",
+			(int)file->mode);
+		exit_cleanup(RERR_UNSUPPORTED);
+	}
 
 	do {
-		pathjoin(fnamebuf, MAXPATHLEN, basis_dir[i], fname);
-		if (link_stat(fnamebuf, &st, 0) < 0 || S_ISDIR(st.st_mode)
-		 || !unchanged_attrs(file, &st))
+		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+		if (link_stat(cmpbuf, stp, 0) < 0)
 			continue;
-		if (S_ISLNK(file->mode)) {
+		switch (type) {
+		case TYPE_DIR:
+			if (!S_ISDIR(stp->st_mode))
+				continue;
+			break;
+		case TYPE_SPECIAL:
+			if (!IS_SPECIAL(stp->st_mode))
+				continue;
+			break;
+		case TYPE_DEVICE:
+			if (!IS_DEVICE(stp->st_mode))
+				continue;
+			break;
 #ifdef SUPPORT_LINKS
-			char lnk[MAXPATHLEN];
-			int len;
-			if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
+		case TYPE_SYMLINK:
+			if (!S_ISLNK(stp->st_mode))
 				continue;
-			lnk[len] = '\0';
-			if (strcmp(lnk, file->u.link) != 0)
+			break;
 #endif
+		}
+		if (match_level < 1) {
+			match_level = 1;
+			best_match = j;
+		}
+		switch (type) {
+		case TYPE_DIR:
+			break;
+		case TYPE_SPECIAL:
+		case TYPE_DEVICE:
+			if (stp->st_rdev != file->u.rdev)
 				continue;
-		} else if (IS_SPECIAL(file->mode)) {
-			if (!IS_SPECIAL(st.st_mode) || st.st_rdev != file->u.rdev)
+			break;
+#ifdef SUPPORT_LINKS
+		case TYPE_SYMLINK:
+			if ((len = readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0)
 				continue;
-		} else if (IS_DEVICE(file->mode)) {
-			if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
+			lnk[len] = '\0';
+			if (strcmp(lnk, file->u.link) != 0)
 				continue;
-		} else {
-			rprintf(FERROR,
-				"internal: try_dests_non() called with invalid mode (%o)\n",
-				(int)file->mode);
-			exit_cleanup(RERR_UNSUPPORTED);
+			break;
+#endif
+		}
+		if (match_level < 2) {
+			match_level = 2;
+			best_match = j;
 		}
+		if (unchanged_attrs(file, stp)) {
+			match_level = 3;
+			best_match = j;
+			break;
+		}
+	} while (basis_dir[++j] != NULL);
+
+	if (!match_level)
+		return -1;
+
+	if (j != best_match) {
+		j = best_match;
+		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
+		if (link_stat(cmpbuf, stp, 0) < 0)
+			return -1;
+	}
+
+	if (match_level == 3) {
 #ifdef SUPPORT_HARD_LINKS
 		if (link_dest
 #ifndef CAN_HARDLINK_SYMLINK
@@ -741,30 +813,34 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 #ifndef CAN_HARDLINK_SPECIAL
 		 && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
 #endif
-		) {
-			if (do_link(fnamebuf, fname) < 0) {
+		 && !S_ISDIR(file->mode)) {
+			if (do_link(cmpbuf, fname) < 0) {
 				rsyserr(FERROR, errno,
 					"failed to hard-link %s with %s",
-					fnamebuf, fname);
-				break;
+					cmpbuf, fname);
+				return j;
 			}
 			if (preserve_hard_links && file->link_u.links)
 				hard_link_cluster(file, ndx, itemizing, code);
-		}
+		} else
 #endif
-		if (itemizing && stdout_format_has_i && verbose > 1) {
-			int changes = compare_dest ? 0 : ITEM_LOCAL_CHANGE
-				    + (link_dest ? ITEM_XNAME_FOLLOWS : 0);
-			char *lp = link_dest ? "" : NULL;
-			itemize(file, ndx, 0, &st, changes, 0, lp);
+			match_level = 2;
+		if (itemizing && stdout_format_has_i
+		 && (verbose > 1 || stdout_format_has_i > 1)) {
+			int chg = compare_dest && type != TYPE_DIR ? 0
+			    : ITEM_LOCAL_CHANGE
+			     + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
+			char *lp = match_level == 3 ? "" : NULL;
+			itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
 		}
 		if (verbose > 1 && maybe_ATTRS_REPORT) {
-			rprintf(FCLIENT, "%s is uptodate\n", fname);
+			rprintf(FCLIENT, "%s%s is uptodate\n",
+				fname, type == TYPE_DIR ? "/" : "");
 		}
 		return -2;
-	} while (basis_dir[++i] != NULL);
+	}
 
-	return -1;
+	return j;
 }
 
 static int phase = 0;
@@ -852,7 +928,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
-			 && safe_stat(dn, &st) < 0
+			 && do_stat(dn, &st) < 0
 			 && create_directory_path(fname) < 0) {
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",
@@ -909,11 +985,27 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			missing_below = file->dir.depth;
 			dry_run++;
 		}
+		real_ret = statret;
+		real_st = st;
+		if (new_root_dir) {
+			if (*fname == '.' && fname[1] == '\0')
+				statret = -1;
+			new_root_dir = 0;
+		}
+		if (statret != 0 && basis_dir[0] != NULL) {
+			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+					      itemizing, maybe_ATTRS_REPORT, code);
+			if (j == -2) {
+				itemizing = 0;
+				code = FNONE;
+			} else if (j >= 0)
+				statret = 1;
+		}
 		if (itemizing && f_out != -1) {
 			itemize(file, ndx, statret, &st,
 				statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
 		}
-		if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
+		if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
 			if (!relative_paths || errno != ENOENT
 			    || create_directory_path(fname) < 0
 			    || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
@@ -930,12 +1022,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				return;
 			}
 		}
-		if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
-		    && verbose && code && f_out != -1)
+		if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
+		    && verbose && code != FNONE && f_out != -1)
 			rprintf(code, "%s/\n", fname);
+		if (real_ret != 0 && one_file_system)
+			real_st.st_dev = filesystem_dev;
 		if (delete_during && f_out != -1 && !phase && dry_run < 2
 		    && (file->flags & FLAG_DEL_HERE))
-			delete_in_dir(the_file_list, fname, file, &st);
+			delete_in_dir(the_file_list, fname, file, &real_st);
 		return;
 	}
 
@@ -960,39 +1054,29 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			char lnk[MAXPATHLEN];
 			int len;
 
-			if (!S_ISDIR(st.st_mode)
-			    && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
-				lnk[len] = 0;
-				/* A link already pointing to the
-				 * right place -- no further action
-				 * required. */
-				if (strcmp(lnk, file->u.link) == 0) {
-					if (itemizing) {
-						itemize(file, ndx, 0, &st, 0,
-							0, NULL);
-					}
-					set_file_attrs(fname, file, &st,
-						       maybe_ATTRS_REPORT);
-					if (preserve_hard_links
-					    && file->link_u.links) {
-						hard_link_cluster(file, ndx,
-								  itemizing,
-								  code);
-					}
-					if (remove_source_files == 1)
-						goto return_with_success;
-					return;
-				}
+			if (!S_ISLNK(st.st_mode))
+				statret = -1;
+			else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
+			      && strncmp(lnk, file->u.link, len) == 0
+			      && file->u.link[len] == '\0') {
+				/* The link is pointing to the right place. */
+				if (itemizing)
+					itemize(file, ndx, 0, &st, 0, 0, NULL);
+				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+				if (preserve_hard_links && file->link_u.links)
+					hard_link_cluster(file, ndx, itemizing, code);
+				if (remove_source_files == 1)
+					goto return_with_success;
+				return;
 			}
 			/* Not the right symlink (or not a symlink), so
 			 * delete it. */
 			if (delete_item(fname, st.st_mode, del_opts) < 0)
 				return;
-			if (!S_ISLNK(st.st_mode))
-				statret = -1;
 		} else if (basis_dir[0] != NULL) {
-			if (try_dests_non(file, fname, ndx, itemizing,
-					  maybe_ATTRS_REPORT, code) == -2) {
+			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+					      itemizing, maybe_ATTRS_REPORT, code);
+			if (j == -2) {
 #ifndef CAN_HARDLINK_SYMLINK
 				if (link_dest) {
 					/* Resort to --copy-dest behavior. */
@@ -1000,14 +1084,16 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 #endif
 				if (!copy_dest)
 					return;
-				itemizing = code = 0;
-			}
+				itemizing = 0;
+				code = FNONE;
+			} else if (j >= 0)
+				statret = 1;
 		}
 		if (preserve_hard_links && file->link_u.links
 		    && hard_link_check(file, ndx, fname, -1, &st,
 				       itemizing, code, HL_SKIP))
 			return;
-		if (do_symlink(file->u.link,fname) != 0) {
+		if (do_symlink(file->u.link, fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
 				full_fname(fname), file->u.link);
 		} else {
@@ -1016,12 +1102,13 @@ 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 -> %s\n", fname,
-					file->u.link);
-			}
+			if (code != FNONE && verbose)
+				rprintf(code, "%s -> %s\n", fname, file->u.link);
 			if (preserve_hard_links && file->link_u.links)
 				hard_link_cluster(file, ndx, itemizing, code);
+			/* This does not check remove_source_files == 1
+			 * because this is one of the items that the old
+			 * --remove-sent-files option would remove. */
 			if (remove_source_files)
 				goto return_with_success;
 		}
@@ -1031,9 +1118,28 @@ 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) {
-			if (try_dests_non(file, fname, ndx, itemizing,
-					  maybe_ATTRS_REPORT, code) == -2) {
+		if (statret == 0) {
+			if ((IS_DEVICE(file->mode) && !IS_DEVICE(st.st_mode))
+			 || (IS_SPECIAL(file->mode) && !IS_SPECIAL(st.st_mode)))
+				statret = -1;
+			else if ((st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
+			      && st.st_rdev == file->u.rdev) {
+				/* The device or special file is identical. */
+				if (itemizing)
+					itemize(file, ndx, 0, &st, 0, 0, NULL);
+				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+				if (preserve_hard_links && file->link_u.links)
+					hard_link_cluster(file, ndx, itemizing, code);
+				if (remove_source_files == 1)
+					goto return_with_success;
+				return;
+			}
+			if (delete_item(fname, st.st_mode, del_opts) < 0)
+				return;
+		} else if (basis_dir[0] != NULL) {
+			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+					      itemizing, maybe_ATTRS_REPORT, code);
+			if (j == -2) {
 #ifndef CAN_HARDLINK_SPECIAL
 				if (link_dest) {
 					/* Resort to --copy-dest behavior. */
@@ -1041,49 +1147,30 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 #endif
 				if (!copy_dest)
 					return;
-				itemizing = code = 0;
-			}
+				itemizing = 0;
+				code = FNONE;
+			} else if (j >= 0)
+				statret = 1;
 		}
-		if (statret != 0
-		 || (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
-		 || st.st_rdev != file->u.rdev) {
-			if (statret == 0
-			 && delete_item(fname, st.st_mode, del_opts) < 0)
-				return;
-			if (preserve_hard_links && file->link_u.links
-			    && hard_link_check(file, ndx, fname, -1, &st,
-					       itemizing, code, HL_SKIP))
-				return;
-			if ((IS_DEVICE(file->mode) && !IS_DEVICE(st.st_mode))
-			 || (IS_SPECIAL(file->mode) && !IS_SPECIAL(st.st_mode)))
-				statret = -1;
-			if (verbose > 2) {
-				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-					fname,
-					(int)file->mode, (int)file->u.rdev);
-			}
-			if (do_mknod(fname,file->mode,file->u.rdev) < 0) {
-				rsyserr(FERROR, errno, "mknod %s failed",
-					full_fname(fname));
-			} else {
-				set_file_attrs(fname, file, NULL, 0);
-				if (itemizing) {
-					itemize(file, ndx, statret, &st,
-						ITEM_LOCAL_CHANGE, 0, NULL);
-				}
-				if (code && verbose)
-					rprintf(code, "%s\n", fname);
-				if (preserve_hard_links && file->link_u.links) {
-					hard_link_cluster(file, ndx,
-							  itemizing, code);
-				}
-				if (remove_source_files == 1)
-					goto return_with_success;
-			}
+		if (preserve_hard_links && file->link_u.links
+		    && hard_link_check(file, ndx, fname, -1, &st,
+				       itemizing, code, HL_SKIP))
+			return;
+		if (verbose > 2) {
+			rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
+				fname, (int)file->mode, (int)file->u.rdev);
+		}
+		if (do_mknod(fname, file->mode, file->u.rdev) < 0) {
+			rsyserr(FERROR, errno, "mknod %s failed",
+				full_fname(fname));
 		} else {
-			if (itemizing)
-				itemize(file, ndx, statret, &st, 0, 0, NULL);
-			set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+			set_file_attrs(fname, file, NULL, 0);
+			if (itemizing) {
+				itemize(file, ndx, statret, &st,
+					ITEM_LOCAL_CHANGE, 0, NULL);
+			}
+			if (code != FNONE && verbose)
+				rprintf(code, "%s\n", fname);
 			if (preserve_hard_links && file->link_u.links)
 				hard_link_cluster(file, ndx, itemizing, code);
 			if (remove_source_files == 1)
@@ -1353,7 +1440,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	if (protocol_version >= 29) {
 		itemizing = 1;
 		maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
-		code = logfile_format_has_i ? 0 : FLOG;
+		code = logfile_format_has_i ? FNONE : FLOG;
 	} else if (am_daemon) {
 		itemizing = logfile_format_has_i && do_xfers;
 		maybe_ATTRS_REPORT = ATTRS_REPORT;
@@ -1361,7 +1448,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	} else if (!am_server) {
 		itemizing = stdout_format_has_i;
 		maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
-		code = itemizing ? 0 : FINFO;
+		code = itemizing ? FNONE : FINFO;
 	} else {
 		itemizing = 0;
 		maybe_ATTRS_REPORT = ATTRS_REPORT;