X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7568ff448aab0b508d997bd30b61769e4acd8efe..84ecaa0eca6e472928688956c844ca5e5a0021c5:/flist.c

diff --git a/flist.c b/flist.c
index cac390b4..2c1094b0 100644
--- a/flist.c
+++ b/flist.c
@@ -97,7 +97,7 @@ int flist_eof = 0; /* all the file-lists are now known */
 
 #define NORMAL_NAME 0
 #define SLASH_ENDING_NAME 1
-#define DOT_NAME 2
+#define DOTDIR_NAME 2
 
 /* Starting from protocol version 26, we always use 64-bit ino_t and dev_t
  * internally, even if this platform does not allow files to have 64-bit inums.
@@ -277,17 +277,6 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
 	if (filter_level == NO_FILTERS)
 		return 0;
 #endif
-	if (fname) {
-		/* never exclude '.', even if somebody does --exclude '*' */
-		if (fname[0] == '.' && !fname[1])
-			return 0;
-		/* Handle the -R version of the '.' dir. */
-		if (fname[0] == '/') {
-			int len = strlen(fname);
-			if (fname[len-1] == '.' && fname[len-2] == '/')
-				return 0;
-		}
-	}
 	if (is_daemon_excluded(fname, is_dir))
 		return 1;
 	if (filter_level != ALL_FILTERS)
@@ -429,28 +418,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
 		}
 	} else if (protocol_version < 28)
 		rdev = MAKEDEV(0, 0);
-	if (preserve_uid) {
-		if ((uid_t)F_OWNER(file) == uid && *lastname)
-			xflags |= XMIT_SAME_UID;
-		else {
-			uid = F_OWNER(file);
-			if (!numeric_ids) {
-				user_name = add_uid(uid);
-				if (inc_recurse && user_name)
-					xflags |= XMIT_USER_NAME_FOLLOWS;
-			}
+	if (!preserve_uid || ((uid_t)F_OWNER(file) == uid && *lastname))
+		xflags |= XMIT_SAME_UID;
+	else {
+		uid = F_OWNER(file);
+		if (!numeric_ids) {
+			user_name = add_uid(uid);
+			if (inc_recurse && user_name)
+				xflags |= XMIT_USER_NAME_FOLLOWS;
 		}
 	}
-	if (preserve_gid) {
-		if ((gid_t)F_GROUP(file) == gid && *lastname)
-			xflags |= XMIT_SAME_GID;
-		else {
-			gid = F_GROUP(file);
-			if (!numeric_ids) {
-				group_name = add_gid(gid);
-				if (inc_recurse && group_name)
-					xflags |= XMIT_GROUP_NAME_FOLLOWS;
-			}
+	if (!preserve_gid || ((gid_t)F_GROUP(file) == gid && *lastname))
+		xflags |= XMIT_SAME_GID;
+	else {
+		gid = F_GROUP(file);
+		if (!numeric_ids) {
+			group_name = add_gid(gid);
+			if (inc_recurse && group_name)
+				xflags |= XMIT_GROUP_NAME_FOLLOWS;
 		}
 	}
 	if (file->modtime == modtime)
@@ -467,15 +452,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
 				np->data = (void*)(long)(first_ndx + ndx + 1);
 				xflags |= XMIT_HLINK_FIRST;
 			}
-			xflags |= XMIT_HLINKED;
 		} else {
 			if (tmp_dev == dev) {
 				if (protocol_version >= 28)
 					xflags |= XMIT_SAME_DEV_pre30;
 			} else
 				dev = tmp_dev;
-			xflags |= XMIT_HLINKED;
 		}
+		xflags |= XMIT_HLINKED;
 	}
 #endif
 
@@ -1019,6 +1003,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	const char *basename;
 	alloc_pool_t *pool;
 	STRUCT_STAT st;
+	int excl_ret;
 	char *bp;
 
 	if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
@@ -1101,7 +1086,17 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	} else
 		flags &= ~FLAG_CONTENT_DIR;
 
-	if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
+	if (S_ISDIR(st.st_mode)) {
+		if (flags & FLAG_DOTDIR_NAME) {
+			/* A "." fname (or "/." fname in relative mode) is
+			 * never excluded.  No other trailing-dotdir names
+			 * are possible. */
+			excl_ret = 0;
+		} else
+			excl_ret = is_excluded(thisname, 1, filter_level);
+	} else
+		excl_ret = is_excluded(thisname, 0, filter_level);
+	if (excl_ret) {
 		if (ignore_perishable)
 			non_perishable_cnt++;
 		return NULL;
@@ -1561,18 +1556,16 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 	}
 }
 
-static char lastpath[MAXPATHLEN] = "";
-static int lastpath_len = 0;
-static struct file_struct *lastpath_struct;
-
 static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 			      char *start, char *limit, int flags, char name_type)
 {
+	static char lastpath[MAXPATHLEN] = "";
+	static int lastpath_len = 0;
+	static struct file_struct *lastpath_struct = NULL;
 	struct file_struct *file;
 	item_list *relname_list;
 	relnamecache **rnpp;
-	char *slash;
-	int len, need_new_dir;
+	int len, need_new_dir, depth = 0;
 	struct filter_list_struct save_filter_list = filter_list;
 
 	flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
@@ -1585,12 +1578,31 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 			need_new_dir = 0;
 		else
 			need_new_dir = 1;
-	} else
+	} else {
+		char *tp = fname, *lp = lastpath;
+		/* Skip any initial directories in our path that we
+		 * have in common with lastpath. */
+		assert(start == fname);
+		for ( ; ; tp++, lp++) {
+			if (tp == limit) {
+				if (*lp == '/' || *lp == '\0')
+					goto done;
+				break;
+			}
+			if (*lp != *tp)
+				break;
+			if (*tp == '/') {
+				start = tp;
+				depth++;
+			}
+		}
 		need_new_dir = 1;
+	}
 
 	if (need_new_dir) {
 		int save_copy_links = copy_links;
 		int save_xfer_dirs = xfer_dirs;
+		char *slash;
 
 		copy_links = xfer_dirs = 1;
 
@@ -1598,7 +1610,10 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 
 		for (slash = start; (slash = strchr(slash+1, '/')) != NULL; ) {
 			*slash = '\0';
-			send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS);
+			file = send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS);
+			depth++;
+			if (!inc_recurse && file && S_ISDIR(file->mode))
+				change_local_filter_dir(fname, strlen(fname), depth);
 			*slash = '/';
 		}
 
@@ -1607,7 +1622,8 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 			if (file && !S_ISDIR(file->mode))
 				file = NULL;
 			lastpath_struct = file;
-		}
+		} else if (file && S_ISDIR(file->mode))
+			change_local_filter_dir(fname, strlen(fname), ++depth);
 
 		strlcpy(lastpath, fname, sizeof lastpath);
 		lastpath_len = limit - fname;
@@ -1819,7 +1835,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	int64 start_write;
 	int use_ff_fd = 0;
 	int disable_buffering;
-	int flags = recurse ? FLAG_CONTENT_DIR : 0;
+	int arg_flags, flags = recurse ? FLAG_CONTENT_DIR : 0;
 	int reading_remotely = filesfrom_host != NULL;
 	int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS)
 #ifdef ICONV_OPTION
@@ -1891,7 +1907,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				fbuf[len++] = '.';
 				fbuf[len] = '\0';
 			}
-			name_type = DOT_NAME;
+			name_type = DOTDIR_NAME;
 		} else if (len > 1 && fbuf[len-1] == '.' && fbuf[len-2] == '.'
 		    && (len == 2 || fbuf[len-3] == '/')) {
 			if (len + 2 >= MAXPATHLEN)
@@ -1899,9 +1915,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			fbuf[len++] = '/';
 			fbuf[len++] = '.';
 			fbuf[len] = '\0';
-			name_type = DOT_NAME;
+			name_type = DOTDIR_NAME;
 		} else if (fbuf[len-1] == '.' && (len == 1 || fbuf[len-2] == '/'))
-			name_type = DOT_NAME;
+			name_type = DOTDIR_NAME;
 		else
 			name_type = NORMAL_NAME;
 
@@ -1949,13 +1965,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				if (fn[0] == '/') {
 					fn = "/.";
 					len = 2;
-					name_type = DOT_NAME;
+					name_type = DOTDIR_NAME;
 				} else if (fn[0] == '.')
-					name_type = DOT_NAME;
+					name_type = DOTDIR_NAME;
 			} else if (fn[len-1] == '/') {
 				fn[--len] = '\0';
 				if (len == 1 && *fn == '.')
-					name_type = DOT_NAME;
+					name_type = DOTDIR_NAME;
 				else
 					name_type = SLASH_ENDING_NAME;
 			}
@@ -1974,7 +1990,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (!*fn) {
 			len = 1;
 			fn = ".";
-			name_type = DOT_NAME;
+			name_type = DOTDIR_NAME;
 		}
 
 		dirlen = dir ? strlen(dir) : 0;
@@ -1996,7 +2012,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			memmove(fbuf, fn, len + 1);
 
 		if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0
-		 || is_daemon_excluded(fbuf, S_ISDIR(st.st_mode) != 0)
+		 || (name_type != DOTDIR_NAME && is_daemon_excluded(fbuf, S_ISDIR(st.st_mode)))
 		 || (relative_paths && path_is_daemon_excluded(fbuf, 1))) {
 			io_error |= IOERR_GENERAL;
 			rsyserr(FERROR_XFER, errno, "link_stat %s failed",
@@ -2023,31 +2039,23 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		} else if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
 			/* Send the implied directories at the start of the
 			 * source spec, so we get their permissions right. */
-			char *lp = lastpath, *slash = fbuf;
-			*p = '\0';
-			/* Skip any initial directories in our path that we
-			 * have in common with lastpath. */
-			for (fn = fbuf; *fn && *lp == *fn; lp++, fn++) {
-				if (*fn == '/')
-					slash = fn;
-			}
-			*p = '/';
-			if (fn != p || (*lp && *lp != '/'))
-				send_implied_dirs(f, flist, fbuf, slash, p, flags, 0);
+			send_implied_dirs(f, flist, fbuf, fbuf, p, flags, 0);
 		}
 
 		if (one_file_system)
 			filesystem_dev = st.st_dev;
 
+		arg_flags = name_type == DOTDIR_NAME ? FLAG_DOTDIR_NAME : 0;
+
 		if (recurse || (xfer_dirs && name_type != NORMAL_NAME)) {
 			struct file_struct *file;
-			int top_flags = FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags;
+			arg_flags |= FLAG_TOP_DIR | FLAG_CONTENT_DIR;
 			file = send_file_name(f, flist, fbuf, &st,
-					      top_flags, ALL_FILTERS);
+					      arg_flags | flags, ALL_FILTERS);
 			if (!file)
 				continue;
 			if (inc_recurse) {
-				if (name_type == DOT_NAME) {
+				if (name_type == DOTDIR_NAME) {
 					if (send_dir_depth < 0) {
 						send_dir_depth = 0;
 						change_local_filter_dir(fbuf, len, send_dir_depth);
@@ -2057,7 +2065,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			} else
 				send_if_directory(f, flist, file, fbuf, len, flags);
 		} else
-			send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS);
+			send_file_name(f, flist, fbuf, &st, arg_flags | flags, ALL_FILTERS);
 	}
 
 	gettimeofday(&end_tv, NULL);