X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3932c423732eefb0ba9035c6467e757e8a484728..d0a6cdb62ed2f62373bbbc95894e123b647f54f2:/flist.c

diff --git a/flist.c b/flist.c
index 32224294..1452d6c6 100644
--- a/flist.c
+++ b/flist.c
@@ -26,7 +26,6 @@
 #include "io.h"
 
 extern int verbose;
-extern int list_only;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
@@ -172,35 +171,6 @@ void show_flist_stats(void)
 	/* Nothing yet */
 }
 
-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));
-	}
-}
-
 /* Stat either a symlink or its referent, depending on the settings of
  * copy_links, copy_unsafe_links, etc.  Returns -1 on error, 0 on success.
  *
@@ -1545,8 +1515,7 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 		int save_copy_links = copy_links;
 		int save_xfer_dirs = xfer_dirs;
 
-		copy_links |= copy_unsafe_links;
-		xfer_dirs = 1;
+		copy_links = xfer_dirs = 1;
 
 		*limit = '\0';
 
@@ -1560,8 +1529,6 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
 		if (inc_recurse) {
 			if (file && !S_ISDIR(file->mode))
 				file = NULL;
-			else if (file)
-				memset(F_DIR_RELS_P(file), 0, sizeof (item_list*));
 			lastpath_struct = file;
 		}
 
@@ -2181,12 +2148,6 @@ struct file_list *recv_file_list(int f)
 	if (verbose > 3)
 		output_flist(flist);
 
-	if (list_only) {
-		int i;
-		for (i = flist->low; i <= flist->high; i++)
-			list_file_entry(flist->files[i]);
-	}
-
 	if (verbose > 2)
 		rprintf(FINFO, "recv_file_list done\n");