X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/649f874292545c177b743657b1dbc7a2c2db03e8..776b9d1c0084e7f1d9e26071540f349193ed534b:/flist.c

diff --git a/flist.c b/flist.c
index ba93b384..b88ab8b9 100644
--- a/flist.c
+++ b/flist.c
@@ -41,11 +41,10 @@ extern int module_id;
 extern int ignore_errors;
 extern int numeric_ids;
 
-extern int cvs_exclude;
-
 extern int recurse;
 extern int xfer_dirs;
 extern char curr_dir[MAXPATHLEN];
+extern unsigned int curr_dir_len;
 extern char *backup_dir;
 extern char *backup_suffix;
 extern int filesfrom_fd;
@@ -71,15 +70,16 @@ extern int max_delete;
 extern int orig_umask;
 extern int list_only;
 
-extern struct exclude_list_struct exclude_list;
-extern struct exclude_list_struct server_exclude_list;
-extern struct exclude_list_struct local_exclude_list;
+extern struct filter_list_struct filter_list;
+extern struct filter_list_struct server_filter_list;
 
 int io_error;
 
 static char empty_sum[MD4_SUM_LENGTH];
 static unsigned int file_struct_len;
 static struct file_list *received_flist;
+static dev_t filesystem_dev; /* used to implement -x */
+static int deletion_count = 0; /* used to implement --max-delete */
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
 static void output_flist(struct file_list *flist, const char *whose_list);
@@ -222,17 +222,13 @@ int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks)
 #endif
 }
 
-/*
- * This function is used to check if a file should be included/excluded
+/* This function is used to check if a file should be included/excluded
  * from the list of files based on its name and type etc.  The value of
- * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES.
- */
-static int check_exclude_file(char *fname, int is_dir, int exclude_level)
+ * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */
+static int is_excluded(char *fname, int is_dir, int filter_level)
 {
-	int rc;
-
 #if 0 /* This currently never happens, so avoid a useless compare. */
-	if (exclude_level == NO_EXCLUDES)
+	if (filter_level == NO_FILTERS)
 		return 0;
 #endif
 	if (fname) {
@@ -246,32 +242,17 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level)
 				return 0;
 		}
 	}
-	if (server_exclude_list.head
-	    && check_exclude(&server_exclude_list, fname, is_dir) < 0)
+	if (server_filter_list.head
+	    && check_filter(&server_filter_list, fname, is_dir) < 0)
 		return 1;
-	if (exclude_level != ALL_EXCLUDES)
+	if (filter_level != ALL_FILTERS)
 		return 0;
-	if (exclude_list.head
-	    && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
-		return rc < 0;
-	if (local_exclude_list.head
-	    && check_exclude(&local_exclude_list, fname, is_dir) < 0)
+	if (filter_list.head
+	    && check_filter(&filter_list, fname, is_dir) < 0)
 		return 1;
 	return 0;
 }
 
-/* used by the one_file_system code */
-static dev_t filesystem_dev;
-
-static void set_filesystem(char *fname)
-{
-	STRUCT_STAT st;
-	if (do_stat(fname, &st) != 0)
-		return;
-	filesystem_dev = st.st_dev;
-}
-
-
 static int to_wire_mode(mode_t mode)
 {
 #if SUPPORT_LINKS
@@ -289,7 +270,8 @@ static mode_t from_wire_mode(int mode)
 }
 
 
-static void send_directory(int f, struct file_list *flist, char *dir);
+static void send_directory(int f, struct file_list *flist,
+			   char *fbuf, unsigned int offset);
 
 static char *flist_dir;
 static int flist_dir_len;
@@ -540,7 +522,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	static gid_t gid;
 	static char lastname[MAXPATHLEN], *lastdir;
 	static int lastdir_depth, lastdir_len = -1;
-	static unsigned int del_heir_name_len = -1;
+	static unsigned int del_heir_name_len = 0;
 	static int in_del_hier = 0;
 	char thisname[MAXPATHLEN];
 	unsigned int l1 = 0, l2 = 0;
@@ -555,7 +537,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 		rdev_major = 0;
 		uid = 0, gid = 0;
 		*lastname = '\0';
-		del_heir_name_len = lastdir_len = -1;
+		lastdir_len = -1;
 		in_del_hier = 0;
 		return;
 	}
@@ -765,7 +747,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
  * important case.  Some systems may not have d_type.
  **/
 struct file_struct *make_file(char *fname, struct file_list *flist,
-			      int exclude_level)
+			      int filter_level)
 {
 	static char *lastdir;
 	static int lastdir_len = -1;
@@ -795,8 +777,8 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	if (readlink_stat(thisname, &st, linkname) != 0) {
 		int save_errno = errno;
 		/* See if file is excluded before reporting an error. */
-		if (exclude_level != NO_EXCLUDES
-		    && check_exclude_file(thisname, 0, exclude_level))
+		if (filter_level != NO_FILTERS
+		    && is_excluded(thisname, 0, filter_level))
 			return NULL;
 		if (save_errno == ENOENT) {
 #if SUPPORT_LINKS
@@ -823,9 +805,9 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		return NULL;
 	}
 
-	/* backup.c calls us with exclude_level set to NO_EXCLUDES. */
-	if (exclude_level == NO_EXCLUDES)
-		goto skip_excludes;
+	/* backup.c calls us with filter_level set to NO_FILTERS. */
+	if (filter_level == NO_FILTERS)
+		goto skip_filters;
 
 	if (S_ISDIR(st.st_mode) && !xfer_dirs) {
 		rprintf(FINFO, "skipping directory %s\n", thisname);
@@ -839,7 +821,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	    && S_ISDIR(st.st_mode))
 		flags |= FLAG_MOUNT_POINT;
 
-	if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
+	if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
 		return NULL;
 
 	if (lp_ignore_nonreadable(module_id)) {
@@ -850,11 +832,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 				return NULL;
 	}
 
-skip_excludes:
+skip_filters:
 
 	if (verbose > 2) {
 		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
-			who_am_i(), thisname, exclude_level);
+			who_am_i(), thisname, filter_level);
 	}
 
 	if ((basename = strrchr(thisname, '/')) != NULL) {
@@ -934,7 +916,7 @@ skip_excludes:
 	memcpy(bp, basename, basename_len);
 	bp += basename_len;
 
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
+#if HAVE_STRUCT_STAT_ST_RDEV
 	if (preserve_devices && IS_DEVICE(st.st_mode))
 		file->u.rdev = st.st_rdev;
 #endif
@@ -990,7 +972,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 
 	/* f is set to -1 when calculating deletion file list */
 	file = make_file(fname, flist,
-	    f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES);
+	    f == -1 && delete_excluded? SERVER_FILTERS : ALL_FILTERS);
 
 	if (!file)
 		return;
@@ -1005,82 +987,63 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	}
 
 	if (recursive && S_ISDIR(file->mode)
-	    && !(file->flags & FLAG_MOUNT_POINT)) {
-		struct exclude_list_struct last_list = local_exclude_list;
-		local_exclude_list.head = local_exclude_list.tail = NULL;
-		send_directory(f, flist, f_name_to(file, fbuf));
-		if (verbose > 2) {
-			rprintf(FINFO, "[%s] popping %sexclude list\n",
-				who_am_i(), local_exclude_list.debug_type);
+	    && !(file->flags & FLAG_MOUNT_POINT) && f_name_to(file, fbuf)) {
+		void *save_filters;
+		unsigned int len = strlen(fbuf);
+		if (len > 1 && fbuf[len-1] == '/')
+			fbuf[--len] = '\0';
+		if (len >= MAXPATHLEN - 1) {
+			io_error |= IOERR_GENERAL;
+			rprintf(FERROR, "skipping long-named directory: %s\n",
+				full_fname(fbuf));
+			return;
 		}
-		clear_exclude_list(&local_exclude_list);
-		local_exclude_list = last_list;
+		save_filters = push_local_filters(fbuf, len);
+		send_directory(f, flist, fbuf, len);
+		pop_local_filters(save_filters);
 	}
 }
 
 
 /* Note that the "recurse" value either contains -1, for infinite recursion,
  * or a number >= 0 indicating how many levels of recursion we will allow. */
-static void send_directory(int f, struct file_list *flist, char *dir)
+static void send_directory(int f, struct file_list *flist,
+			   char *fbuf, unsigned int len)
 {
-	DIR *d;
 	struct dirent *di;
-	char fname[MAXPATHLEN];
-	unsigned int offset;
 	char *p;
+	DIR *d;
 
-	d = opendir(dir);
-	if (!d) {
+	if (!(d = opendir(fbuf))) {
 		io_error |= IOERR_GENERAL;
-		rsyserr(FERROR, errno, "opendir %s failed", full_fname(dir));
+		rsyserr(FERROR, errno, "opendir %s failed", full_fname(fbuf));
 		return;
 	}
 
-	offset = strlcpy(fname, dir, MAXPATHLEN);
-	p = fname + offset;
-	if (offset >= MAXPATHLEN || p[-1] != '/') {
-		if (offset >= MAXPATHLEN - 1) {
-			io_error |= IOERR_GENERAL;
-			rprintf(FERROR, "skipping long-named directory: %s\n",
-				full_fname(fname));
-			closedir(d);
-			return;
-		}
+	p = fbuf + len;
+	if (len != 1 || *fbuf != '/')
 		*p++ = '/';
-		offset++;
-	}
-
-	if (cvs_exclude) {
-		if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
-		    < MAXPATHLEN - offset) {
-			add_exclude_file(&local_exclude_list, fname,
-					 XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
-		} else {
-			io_error |= IOERR_GENERAL;
-			rprintf(FINFO,
-				"cannot cvs-exclude in long-named directory %s\n",
-				full_fname(fname));
-		}
-	}
+	*p = '\0';
 
 	for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
 		char *dname = d_name(di);
 		if (dname[0] == '.' && (dname[1] == '\0'
 		    || (dname[1] == '.' && dname[2] == '\0')))
 			continue;
-		if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset) {
+		if (strlcpy(p, dname, MAXPATHLEN - len) < MAXPATHLEN - len) {
 			int do_subdirs = recurse >= 1 ? recurse-- : recurse;
-			send_file_name(f, flist, fname, do_subdirs, 0);
+			send_file_name(f, flist, fbuf, do_subdirs, 0);
 		} else {
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
 				"cannot send long-named file %s\n",
-				full_fname(fname));
+				full_fname(fbuf));
 		}
 	}
 	if (errno) {
 		io_error |= IOERR_GENERAL;
-		rsyserr(FERROR, errno, "readdir(%s)", dir);
+		*p = '\0';
+		rsyserr(FERROR, errno, "readdir(%s)", fbuf);
 	}
 
 	closedir(d);
@@ -1089,12 +1052,11 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 
 /* This function is normally called by the sender, but the receiving side
  * also uses it to construct one or more file lists if one of the --delete
- * options have been specified.  The delete_in_dir() function sets f to -1
+ * options have been specified.  The delete_files() function sets f to -1
  * so that we just construct the file list in memory without sending it
  * over the wire.  It also has the side-effect of ignoring user-excludes if
  * delete_excluded is set (so that the delete list includes user-excluded
- * files) and it avoids some per-arg init code for limited recursion (since
- * delete_in_dir() sets recurse before calling this function). */
+ * files). */
 struct file_list *send_file_list(int f, int argc, char *argv[])
 {
 	int l;
@@ -1102,6 +1064,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	char *p, *dir, olddir[sizeof curr_dir];
 	char lastpath[MAXPATHLEN] = "";
 	struct file_list *flist;
+	BOOL need_first_push = True;
+	struct timeval start_tv, end_tv;
 	int64 start_write;
 	int use_ff_fd = 0;
 
@@ -1109,6 +1073,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		start_filelist_progress("building file list");
 
 	start_write = stats.total_written;
+	gettimeofday(&start_tv, NULL);
 
 	flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
 			  "send_file_list");
@@ -1122,6 +1087,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				exit_cleanup(RERR_FILESELECT);
 			}
 			use_ff_fd = 1;
+			if (curr_dir_len < MAXPATHLEN - 1) {
+				push_local_filters(curr_dir, curr_dir_len);
+				need_first_push = False;
+			}
 		}
 	}
 
@@ -1152,14 +1121,21 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				fname[l] = '\0';
 			}
 		}
-		if (f == -1)
-			; /* recurse is pre-set */
-		else if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
+		if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
 			if (!recurse && xfer_dirs)
 				recurse = 1; /* allow one level */
 		} else if (recurse > 0)
 			recurse = 0;
 
+		if (need_first_push) {
+			if ((p = strrchr(fname, '/')) != NULL) {
+				if (*++p && strcmp(p, ".") != 0)
+					push_local_filters(fname, p - fname);
+			} else if (strcmp(fname, ".") != 0)
+				push_local_filters(fname, 0);
+			need_first_push = False;
+		}
+
 		if (link_stat(fname, &st, keep_dirlinks) != 0) {
 			if (f != -1) {
 				io_error |= IOERR_GENERAL;
@@ -1244,7 +1220,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		}
 
 		if (one_file_system)
-			set_filesystem(fname);
+			filesystem_dev = st.st_dev;
 
 		do_subdirs = recurse >= 1 ? recurse-- : recurse;
 		send_file_name(f, flist, fname, do_subdirs, XMIT_DEL_START);
@@ -1261,10 +1237,23 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	}
 
 	if (f != -1) {
+		gettimeofday(&end_tv, NULL);
+		stats.flist_buildtime =
+		    (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+			 + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
+		if (stats.flist_buildtime == 0)
+			stats.flist_buildtime = 1;
+		start_tv = end_tv;
+
 		send_file_entry(NULL, f, 0);
 
 		if (show_filelist_p())
 			finish_filelist_progress(flist);
+
+		gettimeofday(&end_tv, NULL);
+		stats.flist_xfertime =
+		    (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+			 + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
 	}
 
 	if (flist->hlink_pool) {
@@ -1658,8 +1647,7 @@ char *f_name_to(struct file_struct *f, char *fbuf)
 }
 
 
-/* Like f_name_to(), but we rotate through 5 static buffers of our own.
- */
+/* Like f_name_to(), but we rotate through 5 static buffers of our own. */
 char *f_name(struct file_struct *f)
 {
 	static char names[5][MAXPATHLEN];
@@ -1670,63 +1658,125 @@ char *f_name(struct file_struct *f)
 	return f_name_to(f, names[n]);
 }
 
+
 static int is_backup_file(char *fn)
 {
 	int k = strlen(fn) - backup_suffix_len;
 	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
 }
 
+
+/* This function is used to implement --delete-during. */
 void delete_in_dir(struct file_list *flist, char *fname)
 {
-	static int deletion_count = 0;
-	struct file_list *del_flist;
-	int save_recurse = recurse;
-	int save_xfer_dirs = xfer_dirs;
-	int save_implied_dirs = implied_dirs;
-	int save_relative_paths = relative_paths;
-	char *argv[1];
-	int i, j, mode;
+	static void *filt_array[MAXPATHLEN/2];
+	static BOOL need_first_push = True;
+	static int fa_lvl = 0;
+	static char fbuf[MAXPATHLEN];
+	struct file_list *dir_list;
+	STRUCT_STAT st;
+	int dlen, j;
+
+	if (!flist) {
+		while (fa_lvl)
+			pop_local_filters(filt_array[--fa_lvl]);
+		need_first_push = True;
+		*fbuf = '\0';
+		return;
+	}
 
 	if (max_delete && deletion_count >= max_delete)
 		return;
 
 	if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
-		rprintf(FINFO, "IO error encountered - skipping file deletion\n");
+		rprintf(FINFO,
+			"IO error encountered - skipping file deletion\n");
 		max_delete = -1; /* avoid duplicating the above warning */
 		return;
 	}
 
-	if (delete_during) {
-		recurse = 1; /* allow one level only */
-		xfer_dirs = 1;
-		implied_dirs = 0;
-		relative_paths = 1;
+	for (j = 0; fbuf[j]; j++) {
+		if (fbuf[j] != fname[j]) {
+			while (fa_lvl) {
+				if (fbuf[j] == '/')
+					pop_local_filters(filt_array[--fa_lvl]);
+				if (!fbuf[++j])
+					break;
+			}
+			break;
+		}
 	}
 
-	argv[0] = fname;
-	del_flist = send_file_list(-1, 1, argv);
+	dlen = strlcpy(fbuf, fname, MAXPATHLEN);
+	if (need_first_push) {
+		if (dlen != 1 || fbuf[0] != '.') {
+			char *s = strrchr(fbuf, '/');
+			int first_dlen;
+			if (s)
+				first_dlen = s - fbuf;
+			else
+				first_dlen = 0;
+			if (!s || s[1] != '.' || s[2] != '\0') {
+				filt_array[fa_lvl++] = push_local_filters(fbuf,
+									  first_dlen);
+			}
+		}
+		need_first_push = False;
+	}
 
-	relative_paths = save_relative_paths;
-	implied_dirs = save_implied_dirs;
-	xfer_dirs = save_xfer_dirs;
-	recurse = save_recurse;
+	if (dlen >= MAXPATHLEN - 1)
+		return;
+	if (fa_lvl >= MAXPATHLEN/2)
+		return; /* impossible... */
 
-	if (!del_flist)
+	if (link_stat(fname, &st, keep_dirlinks) < 0)
+		return;
+
+	if (one_file_system)
+		filesystem_dev = st.st_dev;
+
+	dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
+
+	recurse = 0;
+	filt_array[fa_lvl++] = push_local_filters(fbuf, dlen);
+	send_directory(-1, dir_list, fbuf, dlen);
+	recurse = -1;
+
+	if (dlen == 1 && *fbuf == '.')
+		*fbuf = '\0';
+
+	clean_flist(dir_list, 0, 0);
+
+	if (verbose > 3)
+		output_flist(dir_list, "delete");
+
+	delete_missing(flist, dir_list, fname);
+
+	flist_free(dir_list);
+}
+
+
+/* If an item in dir_list is not found in full_list, delete it from the
+ * filesystem. */
+void delete_missing(struct file_list *full_list, struct file_list *dir_list,
+		    const char *dirname)
+{
+	int i, j, mode;
+
+	if (max_delete && deletion_count >= max_delete)
 		return;
 
 	if (verbose > 1)
-		rprintf(FINFO, "deleting in %s\n", safe_fname(fname));
+		rprintf(FINFO, "deleting in %s\n", safe_fname(dirname));
 
-	for (i = del_flist->count-1; i >= 0; i--) {
-		if (max_delete && deletion_count >= max_delete)
-			break;
-		if (!del_flist->files[i]->basename)
+	for (i = dir_list->count; i--; ) {
+		if (!dir_list->files[i]->basename)
 			continue;
-		mode = del_flist->files[i]->mode;
-		if ((j = flist_find(flist, del_flist->files[i])) < 0
+		mode = dir_list->files[i]->mode;
+		if ((j = flist_find(full_list, dir_list->files[i])) < 0
 		    || (delete_during && S_ISDIR(mode)
-		     && !S_ISDIR(flist->files[j]->mode))) {
-			char *f = f_name(del_flist->files[i]);
+		     && !S_ISDIR(full_list->files[j]->mode))) {
+			char *f = f_name(dir_list->files[i]);
 			if (make_backups && (backup_dir || !is_backup_file(f))
 			  && !S_ISDIR(mode)) {
 				make_backup(f);
@@ -1734,12 +1784,16 @@ void delete_in_dir(struct file_list *flist, char *fname)
 					rprintf(FINFO, "deleting %s\n",
 						safe_fname(f));
 				}
+			} else if (S_ISDIR(mode)) {
+				int dflag = delete_during ? DEL_FORCE_RECURSE
+							  : DEL_NO_RECURSE;
+				delete_file(f, DEL_DIR | dflag);
 			} else {
-				delete_file(f, S_ISDIR(mode)
-						? DEL_DIR | DEL_RECURSE : 0);
+				delete_file(f, 0);
 			}
 			deletion_count++;
+			if (max_delete && deletion_count >= max_delete)
+				break;
 		}
 	}
-	flist_free(del_flist);
 }