X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a1f99493b39610e2ea9deb4bb1c71ba63bce5834..75c51953f165cbb2b256bad9edeb581ec70c36b2:/flist.c

diff --git a/flist.c b/flist.c
index 476e7508..a80e0fb9 100644
--- a/flist.c
+++ b/flist.c
@@ -414,10 +414,8 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 		} else
 			write_byte(f, flags);
 	} else {
-		if (!(flags & 0xFF) && !S_ISDIR(mode))
-			flags |= XMIT_TOP_DIR;
 		if (!(flags & 0xFF))
-			flags |= XMIT_LONG_NAME;
+			flags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR;
 		write_byte(f, flags);
 	}
 	if (flags & XMIT_SAME_NAME)
@@ -480,19 +478,16 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	}
 #endif
 
-	if (always_checksum) {
+	if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
 		char *sum;
+		int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
 		if (S_ISREG(mode))
 			sum = file->u.sum;
-		else if (protocol_version < 28) {
+		else {
 			/* Prior to 28, we sent a useless set of nulls. */
 			sum = empty_sum;
-		} else
-			sum = NULL;
-		if (sum) {
-			write_buf(f, sum,
-			    protocol_version < 21 ? 2 : MD4_SUM_LENGTH);
 		}
+		write_buf(f, sum, slen);
 	}
 
 	strlcpy(lastname, fname, MAXPATHLEN);
@@ -653,7 +648,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 		if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */
 			file->dir.depth--;
 		if (flags & XMIT_TOP_DIR) {
-			in_del_hier = 1;
+			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 == '.')
@@ -708,20 +703,17 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 	}
 #endif
 
-	if (always_checksum) {
+	if (always_checksum && (sum_len || protocol_version < 28)) {
 		char *sum;
+		int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
 		if (sum_len) {
 			file->u.sum = sum = bp;
 			/*bp += sum_len;*/
-		} else if (protocol_version < 28) {
+		} else {
 			/* Prior to 28, we get a useless set of nulls. */
 			sum = empty_sum;
-		} else
-			sum = NULL;
-		if (sum) {
-			read_buf(f, sum,
-			    protocol_version < 21 ? 2 : MD4_SUM_LENGTH);
 		}
+		read_buf(f, sum, slen);
 	}
 
 	if (!preserve_perms) {
@@ -1098,7 +1090,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	}
 
 	while (1) {
-		struct file_struct *file;
 		char fname2[MAXPATHLEN];
 		char *fname = fname2;
 		int is_dot_dir;
@@ -1159,42 +1150,20 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (!relative_paths) {
 			p = strrchr(fname, '/');
 			if (p) {
-				*p = 0;
+				*p = '\0';
 				if (p == fname)
 					dir = "/";
 				else
 					dir = fname;
 				fname = p + 1;
 			}
-		} else if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
-			/* this ensures we send the intermediate directories,
-			   thus getting their permissions right */
-			char *lp = lastpath, *fn = fname, *slash = fname;
-			*p = 0;
-			/* Skip any initial directories in our path that we
-			 * have in common with lastpath. */
-			while (*fn && *lp == *fn) {
-				if (*fn == '/')
-					slash = fn;
-				lp++, fn++;
-			}
-			*p = '/';
-			if (fn != p || (*lp && *lp != '/')) {
-				int save_copy_links = copy_links;
-				int save_xfer_dirs = xfer_dirs;
-				copy_links = copy_unsafe_links;
-				xfer_dirs = 1;
-				while ((slash = strchr(slash+1, '/')) != 0) {
-					*slash = 0;
-					send_file_name(f, flist, fname, 0);
-					*slash = '/';
-				}
-				copy_links = save_copy_links;
-				xfer_dirs = save_xfer_dirs;
-				*p = 0;
-				strlcpy(lastpath, fname, sizeof lastpath);
-				*p = '/';
-			}
+		} else if ((p = strstr(fname, "/./")) != NULL) {
+			*p = '\0';
+			if (p == fname)
+				dir = "/";
+			else
+				dir = fname;
+			fname = p + 3;
 		}
 
 		if (!*fname)
@@ -1204,7 +1173,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			static char *lastdir;
 			static int lastdir_len;
 
-			strcpy(olddir, curr_dir); /* can't overflow */
+			strlcpy(olddir, curr_dir, sizeof olddir);
 
 			if (!push_dir(dir)) {
 				io_error |= IOERR_GENERAL;
@@ -1222,20 +1191,53 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			}
 		}
 
+		if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
+			/* Send the implied directories at the start of the
+			 * source spec, so we get their permissions right. */
+			char *lp = lastpath, *fn = fname, *slash = fname;
+			*p = '\0';
+			/* Skip any initial directories in our path that we
+			 * have in common with lastpath. */
+			while (*fn && *lp == *fn) {
+				if (*fn == '/')
+					slash = fn;
+				lp++, fn++;
+			}
+			*p = '/';
+			if (fn != p || (*lp && *lp != '/')) {
+				int save_copy_links = copy_links;
+				int save_xfer_dirs = xfer_dirs;
+				copy_links = copy_unsafe_links;
+				xfer_dirs = 1;
+				while ((slash = strchr(slash+1, '/')) != 0) {
+					*slash = '\0';
+					send_file_name(f, flist, fname, 0);
+					*slash = '/';
+				}
+				copy_links = save_copy_links;
+				xfer_dirs = save_xfer_dirs;
+				*p = '\0';
+				strlcpy(lastpath, fname, sizeof lastpath);
+				*p = '/';
+			}
+		}
+
 		if (one_file_system)
 			filesystem_dev = st.st_dev;
 
-		if ((file = send_file_name(f, flist, fname, XMIT_TOP_DIR))) {
-			if (recurse || (xfer_dirs && is_dot_dir))
+		if (recurse || (xfer_dirs && is_dot_dir)) {
+			struct file_struct *file;
+			if ((file = send_file_name(f, flist, fname, XMIT_TOP_DIR)))
 				send_if_directory(f, flist, file);
-		}
+		} else
+			send_file_name(f, flist, fname, 0);
 
 		if (olddir[0]) {
 			flist_dir = NULL;
 			flist_dir_len = 0;
 			if (!pop_dir(olddir)) {
 				rsyserr(FERROR, errno, "pop_dir %s failed",
-					full_fname(dir));
+					full_fname(olddir));
 				exit_cleanup(RERR_FILESELECT);
 			}
 		}