X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6f0805f564a5f11e7e93d0b74ee907641c748d5b..da564b51a16259cfc22123ee5134fd7e6398ca1e:/flist.c

diff --git a/flist.c b/flist.c
index 1452d6c6..60ce2ba6 100644
--- a/flist.c
+++ b/flist.c
@@ -1041,26 +1041,26 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 			rprintf(FINFO, "skipping directory %s\n", thisname);
 			return NULL;
 		}
-	} else
-		flags &= ~FLAG_XFER_DIR;
-
-	/* -x only affects directories because we need to avoid recursing
-	 * into a mount-point directory, not to avoid copying a symlinked
-	 * file if -L (or similar) was specified. */
-	if (one_file_system && S_ISDIR(st.st_mode)) {
-		if (flags & FLAG_TOP_DIR)
-			filesystem_dev = st.st_dev;
-		else if (st.st_dev != filesystem_dev) {
-			if (one_file_system > 1) {
-				if (verbose > 2) {
-					rprintf(FINFO, "skipping mount-point dir %s\n",
-						thisname);
+		/* -x only affects dirs because we need to avoid recursing
+		 * into a mount-point directory, not to avoid copying a
+		 * symlinked file if -L (or similar) was specified. */
+		if (one_file_system && flags & FLAG_XFER_DIR) {
+			if (flags & FLAG_TOP_DIR)
+				filesystem_dev = st.st_dev;
+			else if (st.st_dev != filesystem_dev) {
+				if (one_file_system > 1) {
+					if (verbose > 1) {
+						rprintf(FINFO,
+						    "[%s] skipping mount-point dir %s\n",
+						    who_am_i(), thisname);
+					}
+					return NULL;
 				}
-				return NULL;
+				flags |= FLAG_MOUNT_DIR;
 			}
-			flags |= FLAG_MOUNT_DIR;
 		}
-	}
+	} else
+		flags &= ~FLAG_XFER_DIR;
 
 	if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
 		if (ignore_perishable)
@@ -1235,7 +1235,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 {
 	struct file_struct *file;
 #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
-	statx sx;
+	stat_x sx;
 #endif
 
 	file = make_file(fname, flist, stp, flags, filter_level);
@@ -1399,9 +1399,6 @@ static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
 		dir_flist->files[dir_flist->used++] = file;
 		dir_cnt--;
 
-		if (file->flags & FLAG_MOUNT_DIR)
-			continue;
-
 		if (dp)
 			DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
 		else if (parent_dp)
@@ -1495,8 +1492,9 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 			      char *start, char *limit, int flags, int is_dot_dir)
 {
 	struct file_struct *file;
-	item_list *rel_list;
-	char **ep, *slash;
+	item_list *relname_list;
+	relnamecache **rnpp;
+	char *slash;
 	int len, need_new_dir;
 
 	flags &= ~FLAG_XFER_DIR;
@@ -1548,23 +1546,23 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 		return; /* dir must have vanished */
 
 	len = strlen(limit+1);
-	memcpy(&rel_list, F_DIR_RELS_P(lastpath_struct), sizeof rel_list);
-	if (!rel_list) {
-		if (!(rel_list = new0(item_list)))
+	memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list);
+	if (!relname_list) {
+		if (!(relname_list = new0(item_list)))
 			out_of_memory("send_implied_dirs");
-		memcpy(F_DIR_RELS_P(lastpath_struct), &rel_list, sizeof rel_list);
+		memcpy(F_DIR_RELNAMES_P(lastpath_struct), &relname_list, sizeof relname_list);
 	}
-	ep = EXPAND_ITEM_LIST(rel_list, char *, 32);
-	if (!(*ep = new_array(char, 1 + len + 1)))
+	rnpp = EXPAND_ITEM_LIST(relname_list, relnamecache *, 32);
+	if (!(*rnpp = (relnamecache*)new_array(char, sizeof (relnamecache) + len)))
 		out_of_memory("send_implied_dirs");
-	**ep = is_dot_dir;
-	strlcpy(*ep + 1, limit+1, len + 1);
+	(*rnpp)->is_dot_dir = is_dot_dir;
+	strlcpy((*rnpp)->fname, limit+1, len + 1);
 }
 
 static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 {
 	char fbuf[MAXPATHLEN];
-	item_list *rel_list;
+	item_list *relname_list;
 	int len, dlen, flags = FLAG_DIVERT_DIRS | FLAG_XFER_DIR;
 	size_t j;
 
@@ -1578,23 +1576,24 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 
 	change_local_filter_dir(fbuf, dlen, send_dir_depth);
 
-	if (file->flags & FLAG_XFER_DIR)
+	if (BITS_SETnUNSET(file->flags, FLAG_XFER_DIR, FLAG_MOUNT_DIR))
 		send_directory(f, flist, fbuf, dlen, flags);
 
 	if (!relative_paths)
 		return;
 
-	memcpy(&rel_list, F_DIR_RELS_P(file), sizeof rel_list);
-	if (!rel_list)
+	memcpy(&relname_list, F_DIR_RELNAMES_P(file), sizeof relname_list);
+	if (!relname_list)
 		return;
 
-	for (j = 0; j < rel_list->count; j++) {
-		char *slash, *ep = ((char**)rel_list->items)[j];
-		int is_dot_dir = *ep;
+	for (j = 0; j < relname_list->count; j++) {
+		char *slash;
+		relnamecache *rnp = ((relnamecache**)relname_list->items)[j];
+		int is_dot_dir = rnp->is_dot_dir;
 
 		fbuf[dlen] = '/';
-		len = strlcpy(fbuf + dlen + 1, ep+1, sizeof fbuf - dlen - 1);
-		free(ep);
+		len = strlcpy(fbuf + dlen + 1, rnp->fname, sizeof fbuf - dlen - 1);
+		free(rnp);
 		if (len >= (int)sizeof fbuf)
 			continue; /* Impossible... */
 
@@ -1606,7 +1605,7 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 
 		if (is_dot_dir) {
 			STRUCT_STAT st;
-			if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+			if (link_stat(fbuf, &st, 1) != 0) {
 				io_error |= IOERR_GENERAL;
 				rsyserr(FERROR, errno, "link_stat %s failed",
 					full_fname(fbuf));
@@ -1622,13 +1621,14 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 		}
 	}
 
-	free(rel_list);
+	free(relname_list);
 }
 
 void send_extra_file_list(int f, int at_least)
 {
 	struct file_list *flist;
 	int64 start_write;
+	uint16 prev_flags;
 	int future_cnt, save_io_error = io_error;
 
 	if (flist_eof)
@@ -1660,6 +1660,7 @@ void send_extra_file_list(int f, int at_least)
 		flist->parent_ndx = dir_ndx;
 
 		send1extra(f, file, flist);
+		prev_flags = file->flags;
 		dp = F_DIR_NODE_P(file);
 
 		/* If there are any duplicate directory names that follow, we
@@ -1669,8 +1670,11 @@ void send_extra_file_list(int f, int at_least)
 		    && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) {
 			send_dir_ndx = dir_ndx;
 			file = dir_flist->sorted[dir_ndx];
-			if (F_PATHNAME(file) != pathname)
-				send1extra(f, file, flist);
+			/* Try to avoid some duplicate scanning of identical dirs. */
+			if (F_PATHNAME(file) == pathname && prev_flags & FLAG_XFER_DIR)
+				file->flags &= ~FLAG_XFER_DIR;
+			send1extra(f, file, flist);
+			prev_flags = file->flags;
 			dp = F_DIR_NODE_P(file);
 		}
 
@@ -1898,7 +1902,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (fn != fbuf)
 			memmove(fbuf, fn, len + 1);
 
-		if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+		if (link_stat(fbuf, &st, copy_dirlinks || is_dot_dir) != 0) {
 			io_error |= IOERR_GENERAL;
 			rsyserr(FERROR, errno, "link_stat %s failed",
 				full_fname(fbuf));
@@ -2385,6 +2389,8 @@ static void clean_flist(struct file_list *flist, int strip_root)
 				else {
 					if (am_sender)
 						file->flags |= FLAG_DUPLICATE;
+					else    /* Make sure we don't lose vital flags. */
+						fp->flags |= file->flags & (FLAG_TOP_DIR|FLAG_XFER_DIR);
 					keep = j, drop = i;
 				}
 			} else
@@ -2396,11 +2402,6 @@ static void clean_flist(struct file_list *flist, int strip_root)
 					    "removing duplicate name %s from file list (%d)\n",
 					    f_name(file, fbuf), drop + flist->ndx_start);
 				}
-				/* Make sure we don't lose track of a user-specified
-				 * top directory. */
-				flist->sorted[keep]->flags |= flist->sorted[drop]->flags
-							   & (FLAG_TOP_DIR|FLAG_XFER_DIR);
-
 				clear_file(flist->sorted[drop]);
 			}