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

diff --git a/generator.c b/generator.c
index 45022ef7..f711ffdb 100644
--- a/generator.c
+++ b/generator.c
@@ -1072,6 +1072,35 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 	return j;
 }
 
+static void list_file_entry(struct file_struct *f)
+{
+	char permbuf[PERMSTRING_SIZE];
+	double len;
+
+	if (!F_IS_ACTIVE(f)) {
+		/* this can happen if duplicate names were removed */
+		return;
+	}
+
+	permstring(permbuf, f->mode);
+	len = F_LENGTH(f);
+
+	/* TODO: indicate '+' if the entry has an ACL. */
+
+#ifdef SUPPORT_LINKS
+	if (preserve_links && S_ISLNK(f->mode)) {
+		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
+			permbuf, len, timestring(f->modtime),
+			f_name(f, NULL), F_SYMLINK(f));
+	} else
+#endif
+	{
+		rprintf(FINFO, "%s %11.0f %s %s\n",
+			permbuf, len, timestring(f->modtime),
+			f_name(f, NULL));
+	}
+}
+
 static int phase = 0;
 static int dflt_perms;
 
@@ -1102,18 +1131,25 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	char *fnamecmp, *partialptr, *backupptr = NULL;
 	char fnamecmpbuf[MAXPATHLEN];
 	uchar fnamecmp_type;
+	int implied_dirs_are_missing = relative_paths && !implied_dirs && !inc_recurse;
 	int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0;
 
-	if (list_only)
-		return;
-
 	if (verbose > 2)
 		rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
 
+	if (list_only) {
+		if (S_ISDIR(file->mode)
+		 && ((!implied_dirs && !(file->flags & FLAG_XFER_DIR))
+		  || (inc_recurse && ndx != cur_flist->ndx_start - 1)))
+			return;
+		list_file_entry(file);
+		return;
+	}
+
 	if (server_filter_list.head) {
 		if (excluded_below >= 0) {
 			if (F_DEPTH(file) > excluded_below
-			 && (implied_dirs || f_name_has_prefix(file, excluded_dir)))
+			 && (!implied_dirs_are_missing || f_name_has_prefix(file, excluded_dir)))
 				goto skipping;
 			excluded_below = -1;
 		}
@@ -1135,7 +1171,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if (missing_below >= 0) {
 		if (F_DEPTH(file) <= missing_below
-		 || (!implied_dirs && !f_name_has_prefix(file, missing_dir))) {
+		 || (implied_dirs_are_missing && !f_name_has_prefix(file, missing_dir))) {
 			if (dry_run)
 				dry_run--;
 			missing_below = -1;
@@ -1212,8 +1248,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	if (S_ISDIR(file->mode)) {
-		if (inc_recurse && ndx != cur_flist->ndx_start - 1
-		 && file->flags & FLAG_XFER_DIR) {
+		if (!implied_dirs && !(file->flags & FLAG_XFER_DIR))
+			goto cleanup;
+		if (inc_recurse && ndx != cur_flist->ndx_start - 1) {
 			/* In inc_recurse mode we want ot make sure any missing
 			 * directories get created while we're still processing
 			 * the parent dir (which allows us to touch the parent
@@ -1779,7 +1816,8 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 	 * transfer and/or re-set any tweaked modified-time values. */
 	for (i = start; i <= end; i++, counter++) {
 		file = flist->files[i];
-		if (!S_ISDIR(file->mode))
+		if (!S_ISDIR(file->mode)
+		 || (relative_paths && !implied_dirs && !(file->flags & FLAG_XFER_DIR)))
 			continue;
 		if (verbose > 3) {
 			fname = f_name(file, NULL);
@@ -1870,8 +1908,6 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
 			/* Skip directory touch-up. */
 		} else if (first_flist->ndx_start != 0)
 			touch_up_dirs(dir_flist, first_flist->parent_ndx);
-		else if (relative_paths && implied_dirs)
-			touch_up_dirs(first_flist, -1);
 
 		flist_free(first_flist); /* updates first_flist */
 	}