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

diff --git a/flist.c b/flist.c
index ba93b384..bc247a88 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,9 +70,8 @@ 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;
 
@@ -222,17 +220,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,16 +240,13 @@ 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;
 }
@@ -765,7 +756,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 +786,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 +814,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 +830,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 +841,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 +925,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 +981,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;
@@ -1006,15 +997,7 @@ 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);
-		}
-		clear_exclude_list(&local_exclude_list);
-		local_exclude_list = last_list;
 	}
 }
 
@@ -1027,6 +1010,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 	struct dirent *di;
 	char fname[MAXPATHLEN];
 	unsigned int offset;
+	void *save_filters;
 	char *p;
 
 	d = opendir(dir);
@@ -1050,18 +1034,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 		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));
-		}
-	}
+	save_filters = push_local_filters(fname, offset);
 
 	for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
 		char *dname = d_name(di);
@@ -1083,6 +1056,8 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 		rsyserr(FERROR, errno, "readdir(%s)", dir);
 	}
 
+	pop_local_filters(save_filters);
+
 	closedir(d);
 }
 
@@ -1102,6 +1077,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 +1086,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 +1100,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;
+			}
 		}
 	}
 
@@ -1160,6 +1142,15 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		} 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;
@@ -1261,10 +1252,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) {
@@ -1735,8 +1739,10 @@ void delete_in_dir(struct file_list *flist, char *fname)
 						safe_fname(f));
 				}
 			} else {
-				delete_file(f, S_ISDIR(mode)
-						? DEL_DIR | DEL_RECURSE : 0);
+				int dflags = delete_during
+				    ? DEL_DIR | DEL_FORCE_RECURSE
+				    : DEL_DIR | DEL_NO_RECURSE;
+				delete_file(f, S_ISDIR(mode) ? dflags : 0);
 			}
 			deletion_count++;
 		}