X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3447d61048dbdaf514ba7ec3d6fd37a57d722e9f..bb0d8edfadbe84135631491f41d4b7b0548d3365:/generator.c

diff --git a/generator.c b/generator.c
index bbbc05f6..1a22794b 100644
--- a/generator.c
+++ b/generator.c
@@ -83,9 +83,7 @@ extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
 extern int max_delete;
 extern int force_delete;
-extern int one_file_system;
 extern struct stats stats;
-extern dev_t filesystem_dev;
 extern char *backup_dir;
 extern char *backup_suffix;
 extern int backup_suffix_len;
@@ -224,7 +222,6 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 	static int already_warned = 0;
 	struct file_list *dirlist;
 	char delbuf[MAXPATHLEN];
-	STRUCT_STAT st;
 	int dlen, i;
 
 	if (!flist) {
@@ -236,7 +233,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();
@@ -261,27 +258,26 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 	dlen = strlen(fbuf);
 	filt_array[cur_depth] = push_local_filters(fbuf, dlen);
 
-	if (link_stat(fbuf, &st, keep_dirlinks) < 0)
+	if (file->flags & FLAG_MOUNT_POINT)
 		return;
 
-	if (one_file_system) {
-		if (file->flags & FLAG_TOP_DIR)
-			filesystem_dev = st.st_dev;
-		else if (filesystem_dev != st.st_dev)
-			return;
-	}
-
 	dirlist = get_dirlist(fbuf, dlen, 0);
 
 	/* If an item in dirlist is not found in flist, delete it
 	 * from the filesystem. */
 	for (i = dirlist->count; i--; ) {
 		struct file_struct *fp = dirlist->files[i];
-		if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
+		if (!fp->basename)
+			continue;
+		if (fp->flags & FLAG_MOUNT_POINT) {
+			int j = flist_find(flist, fp);
+			if (j >= 0)
+				flist->files[j]->flags |= FLAG_MOUNT_POINT;
 			continue;
+		}
 		if (flist_find(flist, fp) < 0) {
 			int mode = fp->mode;
-			f_name_to(fp, delbuf);
+			f_name(fp, delbuf);
 			delete_item(delbuf, mode, DEL_FORCE_RECURSE);
 		}
 	}
@@ -294,6 +290,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 static void do_delete_pass(struct file_list *flist)
 {
 	char fbuf[MAXPATHLEN];
+	STRUCT_STAT st;
 	int j;
 
 	if (dry_run > 1 /* destination doesn't exist yet */
@@ -306,9 +303,13 @@ static void do_delete_pass(struct file_list *flist)
 		if (!(file->flags & FLAG_DEL_HERE))
 			continue;
 
-		f_name_to(file, fbuf);
+		f_name(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);
+
+		if (link_stat(fbuf, &st, keep_dirlinks) < 0
+		 || !S_ISDIR(st.st_mode))
+			continue;
 
 		delete_in_dir(flist, fbuf, file);
 	}
@@ -360,7 +361,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 
 	iflags &= 0xffff;
 	if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
-	  || (xname && *xname)) && !read_batch) {
+	  || log_format_has_i > 1 || (xname && *xname)) && !read_batch) {
 		if (protocol_version >= 29) {
 			if (ndx >= 0)
 				write_int(sock_f_out, ndx);
@@ -665,7 +666,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		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;
 	}
@@ -676,7 +677,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		if (copy_file(cmpbuf, fname, file->mode) < 0) {
 			if (verbose) {
 				rsyserr(FINFO, errno, "copy_file %s => %s",
-					full_fname(cmpbuf), safe_fname(fname));
+					full_fname(cmpbuf), fname);
 			}
 			return -1;
 		}
@@ -688,7 +689,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		  || (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)
@@ -715,10 +716,12 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		 || !unchanged_attrs(file, &st))
 			continue;
 		if (S_ISLNK(file->mode)) {
+#ifdef SUPPORT_LINKS
 			if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
 				continue;
 			lnk[len] = '\0';
 			if (strcmp(lnk, file->u.link) != 0)
+#endif
 				continue;
 		} else {
 			if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
@@ -742,7 +745,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		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;
 	} while (basis_dir[++i] != NULL);
@@ -794,10 +797,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) {
@@ -813,7 +814,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;
 		}
@@ -847,7 +848,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;
 	}
@@ -891,7 +892,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);
@@ -908,11 +909,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
 			if (verbose) {
 				if (the_file_list->count == 1)
-					fname = f_name(file);
+					fname = f_name(file, NULL);
 				rprintf(FINFO,
 					"ignoring unsafe symlink %s -> \"%s\"\n",
-					full_fname(fname),
-					safe_fname(file->u.link));
+					full_fname(fname), file->u.link);
 			}
 			return;
 		}
@@ -963,7 +963,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) {
@@ -971,8 +971,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];
@@ -1011,7 +1011,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) {
@@ -1023,10 +1023,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);
@@ -1044,41 +1042,38 @@ 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));
+			fname = f_name(file, NULL);
+		rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
 		return;
 	}
 
 	if (max_size && file->length > max_size) {
 		if (verbose > 1) {
 			if (the_file_list->count == 1)
-				fname = f_name(file);
-			rprintf(FINFO, "%s is over max-size\n",
-				safe_fname(fname));
+				fname = f_name(file, NULL);
+			rprintf(FINFO, "%s is over max-size\n", fname);
 		}
 		return;
 	}
 	if (min_size && file->length < min_size) {
 		if (verbose > 1) {
 			if (the_file_list->count == 1)
-				fname = f_name(file);
-			rprintf(FINFO, "%s is under min-size\n",
-				safe_fname(fname));
+				fname = f_name(file, NULL);
+			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;
 	}
 
@@ -1119,10 +1114,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		int j = find_fuzzy(file, fuzzy_dirlist);
 		if (j >= 0) {
 			fuzzy_file = fuzzy_dirlist->files[j];
-			f_name_to(fuzzy_file, fnamecmpbuf);
+			f_name(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;
@@ -1203,7 +1198,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			close(fd);
 			return;
 		}
-		if (!(back_file = make_file(fname, NULL, NO_FILTERS))) {
+		if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
 			close(fd);
 			goto pretend_missing;
 		}
@@ -1227,7 +1222,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)
@@ -1267,7 +1262,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);
 	}
@@ -1275,7 +1270,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	close(fd);
 }
 
-
 void generate_files(int f_out, struct file_list *flist, char *local_name)
 {
 	int i;
@@ -1341,7 +1335,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		if (local_name)
 			strlcpy(fbuf, local_name, sizeof fbuf);
 		else
-			f_name_to(file, fbuf);
+			f_name(file, fbuf);
 		recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
 			       code, f_out);
 
@@ -1395,7 +1389,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		if (local_name)
 			strlcpy(fbuf, local_name, sizeof fbuf);
 		else
-			f_name_to(file, fbuf);
+			f_name(file, fbuf);
 		recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
 			       code, f_out);
 	}
@@ -1438,11 +1432,12 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		 * modified-time values. */
 		for (i = 0; i < flist->count; i++) {
 			struct file_struct *file = flist->files[i];
+
 			if (!file->basename || !S_ISDIR(file->mode))
 				continue;
 			if (!need_retouch_dir_times && file->mode & S_IWUSR)
 				continue;
-			recv_generator(f_name(file), file, i, itemizing,
+			recv_generator(f_name(file, NULL), file, i, itemizing,
 				       maybe_PERMS_REPORT, code, -1);
 			if (allowed_lull && !(++j % lull_mod))
 				maybe_send_keepalive();