X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3b17384631b95be73f69dd3a712009a5792c0f3c..207522aef5774099defb1f8088996f8ae2e671cc:/flist.c

diff --git a/flist.c b/flist.c
index 9654bd72..43aa9713 100644
--- a/flist.c
+++ b/flist.c
@@ -48,10 +48,12 @@ extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_perms;
 extern int preserve_devices;
+extern int preserve_specials;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int relative_paths;
 extern int implied_dirs;
+extern int prune_empty_dirs;
 extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
@@ -70,10 +72,11 @@ extern struct filter_list_struct server_filter_list;
 int io_error;
 int checksum_len;
 dev_t filesystem_dev; /* used to implement -x */
+unsigned int file_struct_len;
 
 static char empty_sum[MD4_SUM_LENGTH];
 static int flist_count_offset;
-static unsigned int file_struct_len;
+static int max_dir_depth = 0;
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
 static void output_flist(struct file_list *flist);
@@ -343,16 +346,14 @@ static void send_file_entry(struct file_struct *file, int f)
 		flags |= XMIT_SAME_MODE;
 	else
 		mode = file->mode;
-	if (preserve_devices) {
+	if ((preserve_devices && IS_DEVICE(mode))
+	 || (preserve_specials && IS_SPECIAL(mode))) {
 		if (protocol_version < 28) {
-			if (IS_DEVICE(mode)) {
-				if (file->u.rdev == rdev)
-					flags |= XMIT_SAME_RDEV_pre28;
-				else
-					rdev = file->u.rdev;
-			} else
-				rdev = makedev(0, 0);
-		} else if (IS_DEVICE(mode)) {
+			if (file->u.rdev == rdev)
+				flags |= XMIT_SAME_RDEV_pre28;
+			else
+				rdev = file->u.rdev;
+		} else {
 			rdev = file->u.rdev;
 			if ((uint32)major(rdev) == rdev_major)
 				flags |= XMIT_SAME_RDEV_MAJOR;
@@ -361,7 +362,8 @@ static void send_file_entry(struct file_struct *file, int f)
 			if ((uint32)minor(rdev) <= 0xFFu)
 				flags |= XMIT_RDEV_MINOR_IS_SMALL;
 		}
-	}
+	} else if (protocol_version < 28)
+		rdev = makedev(0, 0);
 	if (file->uid == uid)
 		flags |= XMIT_SAME_UID;
 	else
@@ -437,7 +439,8 @@ static void send_file_entry(struct file_struct *file, int f)
 			add_gid(gid);
 		write_int(f, gid);
 	}
-	if (preserve_devices && IS_DEVICE(mode)) {
+	if ((preserve_devices && IS_DEVICE(mode))
+	 || (preserve_specials && IS_SPECIAL(mode))) {
 		if (protocol_version < 28) {
 			if (!(flags & XMIT_SAME_RDEV_pre28))
 				write_int(f, (int)rdev);
@@ -569,19 +572,20 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 	if (!(flags & XMIT_SAME_MODE))
 		mode = from_wire_mode(read_int(f));
 
+	if (chmod_modes && !S_ISLNK(mode))
+		mode = tweak_mode(mode, chmod_modes);
+
 	if (preserve_uid && !(flags & XMIT_SAME_UID))
 		uid = (uid_t)read_int(f);
 	if (preserve_gid && !(flags & XMIT_SAME_GID))
 		gid = (gid_t)read_int(f);
 
-	if (preserve_devices) {
+	if ((preserve_devices && IS_DEVICE(mode))
+	 || (preserve_specials && IS_SPECIAL(mode))) {
 		if (protocol_version < 28) {
-			if (IS_DEVICE(mode)) {
-				if (!(flags & XMIT_SAME_RDEV_pre28))
-					rdev = (dev_t)read_int(f);
-			} else
-				rdev = makedev(0, 0);
-		} else if (IS_DEVICE(mode)) {
+			if (!(flags & XMIT_SAME_RDEV_pre28))
+				rdev = (dev_t)read_int(f);
+		} else {
 			uint32 rdev_minor;
 			if (!(flags & XMIT_SAME_RDEV_MAJOR))
 				rdev_major = read_int(f);
@@ -591,7 +595,8 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 				rdev_minor = read_int(f);
 			rdev = makedev(rdev_major, rdev_minor);
 		}
-	}
+	} else if (protocol_version < 28)
+		rdev = makedev(0, 0);
 
 #ifdef SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(mode)) {
@@ -616,7 +621,6 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 	memset(bp, 0, file_struct_len);
 	bp += file_struct_len;
 
-	file->flags = 0;
 	file->modtime = modtime;
 	file->length = file_length;
 	file->mode = mode;
@@ -631,6 +635,8 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 		bp[-1] = '\0';
 		lastdir_depth = count_dir_elements(lastdir);
 		file->dir.depth = lastdir_depth + 1;
+		if (lastdir_depth >= max_dir_depth)
+			max_dir_depth = lastdir_depth + 1;
 	} else if (dirname) {
 		file->dirname = dirname; /* we're reusing lastname */
 		file->dir.depth = lastdir_depth + 1;
@@ -644,13 +650,14 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 			in_del_hier = recurse;
 			del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2;
 			if (relative_paths && del_hier_name_len > 2
-			    && basename_len == 1+1 && *basename == '.')
+			    && lastname[del_hier_name_len-1] == '.'
+			    && lastname[del_hier_name_len-2] == '/')
 				del_hier_name_len -= 2;
 			file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
 		} else if (in_del_hier) {
 			if (!relative_paths || !del_hier_name_len
 			 || (l1 >= del_hier_name_len
-			  && thisname[del_hier_name_len] == '/'))
+			  && lastname[del_hier_name_len] == '/'))
 				file->flags |= FLAG_DEL_HERE;
 			else
 				in_del_hier = 0;
@@ -661,7 +668,8 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 	memcpy(bp, basename, basename_len);
 	bp += basename_len;
 
-	if (preserve_devices && IS_DEVICE(mode))
+	if ((preserve_devices && IS_DEVICE(mode))
+	 || (preserve_specials && IS_SPECIAL(mode)))
 		file->u.rdev = rdev;
 
 #ifdef SUPPORT_LINKS
@@ -806,9 +814,14 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	 * into a mount-point directory, not to avoid copying a symlinked
 	 * file if -L (or similar) was specified. */
 	if (one_file_system && st.st_dev != filesystem_dev
-	    && S_ISDIR(st.st_mode)) {
-		if (one_file_system > 1)
+	 && S_ISDIR(st.st_mode)) {
+		if (one_file_system > 1) {
+			if (verbose > 2) {
+				rprintf(FINFO, "skipping mount-point dir %s\n",
+					thisname);
+			}
 			return NULL;
+		}
 		flags |= FLAG_MOUNT_POINT;
 	}
 
@@ -870,10 +883,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	file->flags = flags;
 	file->modtime = st.st_mtime;
 	file->length = st.st_size;
-	if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
-		file->mode = tweak_mode(st.st_mode, chmod_modes);
-	else
-		file->mode = st.st_mode;
+	file->mode = st.st_mode;
 	file->uid = st.st_uid;
 	file->gid = st.st_gid;
 
@@ -911,7 +921,8 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	bp += basename_len;
 
 #ifdef HAVE_STRUCT_STAT_ST_RDEV
-	if (preserve_devices && IS_DEVICE(st.st_mode))
+	if ((preserve_devices && IS_DEVICE(st.st_mode))
+	 || (preserve_specials && IS_SPECIAL(st.st_mode)))
 		file->u.rdev = st.st_rdev;
 #endif
 
@@ -936,7 +947,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	if (keep_dirlinks && linkname_len && flist) {
 		STRUCT_STAT st2;
 		int save_mode = file->mode;
-		file->mode = S_IFDIR; /* find a directory w/our name */
+		file->mode = S_IFDIR; /* Find a directory with our name. */
 		if (flist_find(the_file_list, file) >= 0
 		    && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
 			file->modtime = st2.st_mtime;
@@ -966,6 +977,9 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 	if (!file)
 		return NULL;
 
+	if (chmod_modes && !S_ISLNK(file->mode))
+		file->mode = tweak_mode(file->mode, chmod_modes);
+
 	maybe_emit_filelist_progress(flist->count + flist_count_offset);
 
 	flist_expand(flist);
@@ -1315,8 +1329,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	 * without causing a compatibility problem with older versions. */
 	clean_flist(flist, 0, 0);
 
-	/* Now send the uid/gid list. This was introduced in
-	 * protocol version 15 */
 	send_uid_list(f);
 
 	/* send the io_error flag */
@@ -1386,8 +1398,6 @@ struct file_list *recv_file_list(int f)
 	clean_flist(flist, relative_paths, 1);
 
 	if (f >= 0) {
-		/* Now send the uid/gid list. This was introduced in
-		 * protocol version 15 */
 		recv_uid_list(f, flist);
 
 		/* Recv the io_error flag */
@@ -1429,26 +1439,48 @@ static int file_compare(struct file_struct **file1, struct file_struct **file2)
 int flist_find(struct file_list *flist, struct file_struct *f)
 {
 	int low = flist->low, high = flist->high;
-	int ret, mid, mid_up;
+	int diff, mid, mid_up;
 
 	while (low <= high) {
 		mid = (low + high) / 2;
-		for (mid_up = mid; !flist->files[mid_up]->basename; mid_up++) {}
-		if (mid_up <= high)
-			ret = f_name_cmp(flist->files[mid_up], f);
-		else
-			ret = 1;
-		if (ret == 0) {
+		if (flist->files[mid]->basename)
+			mid_up = mid;
+		else {
+			/* Scan for the next non-empty entry using the cached
+			 * distance values.  If the value isn't fully up-to-
+			 * date, update it. */
+			mid_up = mid + flist->files[mid]->dir.depth;
+			if (!flist->files[mid_up]->basename) {
+				do {
+				    mid_up += flist->files[mid_up]->dir.depth;
+				} while (!flist->files[mid_up]->basename);
+				flist->files[mid]->dir.depth = mid_up - mid;
+			}
+			if (mid_up > high) {
+				/* If there's nothing left above us, set high to
+				 * a non-empty entry below us and continue. */
+				high = mid - flist->files[mid]->length;
+				if (!flist->files[high]->basename) {
+					do {
+					    high -= flist->files[high]->length;
+					} while (!flist->files[high]->basename);
+					flist->files[mid]->length = mid - high;
+				}
+				continue;
+			}
+		}
+		diff = f_name_cmp(flist->files[mid_up], f);
+		if (diff == 0) {
 			if (protocol_version < 29
 			    && S_ISDIR(flist->files[mid_up]->mode)
 			    != S_ISDIR(f->mode))
 				return -1;
 			return mid_up;
 		}
-		if (ret > 0)
-			high = mid - 1;
-		else
+		if (diff < 0)
 			low = mid_up + 1;
+		else
+			high = mid - 1;
 	}
 	return -1;
 }
@@ -1459,9 +1491,15 @@ int flist_find(struct file_list *flist, struct file_struct *f)
  */
 void clear_file(int i, struct file_list *flist)
 {
-	if (flist->hlink_pool && flist->files[i]->link_u.idev)
-		pool_free(flist->hlink_pool, 0, flist->files[i]->link_u.idev);
-	memset(flist->files[i], 0, file_struct_len);
+	struct file_struct *file = flist->files[i];
+	if (flist->hlink_pool && file->link_u.idev)
+		pool_free(flist->hlink_pool, 0, file->link_u.idev);
+	memset(file, 0, file_struct_len);
+	/* In an empty entry, dir.depth is an offset to the next non-empty
+	 * entry.  Likewise for length in the opposite direction.  We assume
+	 * that we're alone for now since flist_find() will collate adjacent
+	 * items for any entries that are encountered during the find. */
+	file->length = file->dir.depth = 1;
 }
 
 /*
@@ -1509,6 +1547,7 @@ void flist_free(struct file_list *flist)
  */
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 {
+	char fbuf[MAXPATHLEN];
 	int i, prev_i = 0;
 
 	if (!flist)
@@ -1562,10 +1601,10 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			if (verbose > 1 && !am_server) {
 				rprintf(FINFO,
 					"removing duplicate name %s from file list (%d)\n",
-					f_name(file, NULL), drop);
+					f_name(file, fbuf), drop);
 			}
-			/* Make sure that if we unduplicate '.', that we don't
-			 * lose track of a user-specified top directory. */
+			/* Make sure we don't lose track of a user-specified
+			 * top directory. */
 			flist->files[keep]->flags |= flist->files[drop]->flags
 						   & (FLAG_TOP_DIR|FLAG_DEL_HERE);
 
@@ -1593,16 +1632,58 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 
 			if (!file->dirname)
 				continue;
-			if (*file->dirname == '/') {
-				char *s = file->dirname + 1;
-				while (*s == '/') s++;
-				memmove(file->dirname, s, strlen(s) + 1);
-			}
-
+			while (*file->dirname == '/')
+				file->dirname++;
 			if (!*file->dirname)
 				file->dirname = NULL;
 		}
 	}
+
+	if (prune_empty_dirs && no_dups && max_dir_depth) {
+		int j, cur_depth = 0;
+		int *maybe_dirs = new_array(int, max_dir_depth);
+
+		maybe_dirs[0] = -1;
+
+		for (i = flist->low; i <= flist->high; i++) {
+			struct file_struct *file = flist->files[i];
+
+			if (S_ISDIR(file->mode) && file->dir.depth) {
+				j = cur_depth;
+				cur_depth = file->dir.depth - 1;
+				for ( ; j >= cur_depth; j--) {
+					if (maybe_dirs[j] < 0)
+						continue;
+					clear_file(maybe_dirs[j], flist);
+				}
+				if (is_excluded(f_name(file, fbuf), 1,
+						       ALL_FILTERS)) {
+					for (j = 0; j <= cur_depth; j++)
+						maybe_dirs[j] = -1;
+				} else
+					maybe_dirs[cur_depth] = i;
+			} else if (maybe_dirs[cur_depth] >= 0) {
+				for (j = 0; j <= cur_depth; j++)
+					maybe_dirs[j] = -1;
+			}
+		}
+		for (j = cur_depth; j >= 0; j--) {
+			if (maybe_dirs[j] < 0)
+				continue;
+			clear_file(maybe_dirs[j], flist);
+		}
+
+		for (i = flist->low; i <= flist->high; i++) {
+			if (flist->files[i]->basename)
+				break;
+		}
+		flist->low = i;
+		for (i = flist->high; i >= flist->low; i--) {
+			if (flist->files[i]->basename)
+				break;
+		}
+		flist->high = i;
+	}
 }
 
 static void output_flist(struct file_list *flist)