X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4f802c66370f222359ffb8571d5d57b512fb1789..e1ac7791fefaf2489d35d6e37707cc7573cade4d:/generator.c

diff --git a/generator.c b/generator.c
index d93529cf..271b55fa 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;
 
@@ -1105,12 +1134,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	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
@@ -1674,8 +1709,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			close(fd);
 			goto cleanup;
 		}
-		if ((f_copy = do_open(backupptr,
-		    O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
+		if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0
+		 && (errno != ENOENT || make_bak_dir(backupptr) < 0
+		  || (f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)) {
 			rsyserr(FERROR, errno, "open %s",
 				full_fname(backupptr));
 			unmake_file(back_file);