X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/45e08edb0869c680ffe110bf0e5117baa5a85510..44e9e221f3c36df43cf22a9f2407de12cfbf9a99:/main.c

diff --git a/main.c b/main.c
index 7459e1ea..03133cf1 100644
--- a/main.c
+++ b/main.c
@@ -27,6 +27,7 @@ extern struct stats stats;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
+extern int am_generator;
 extern int am_daemon;
 extern int verbose;
 extern int blocking_io;
@@ -57,6 +58,7 @@ extern char *rsync_path;
 extern char *shell_cmd;
 extern struct file_list *batch_flist;
 
+
 /* there's probably never more than at most 2 outstanding child processes,
  * but set it higher just in case.
  */
@@ -198,7 +200,7 @@ static void show_malloc_stats(void)
 		getpid(),
 		am_server ? "server " : "",
 		am_daemon ? "daemon " : "",
-		am_sender ? "sender" : "receiver");
+		who_am_i());
 	rprintf(FINFO, "  arena:     %10d   (bytes from sbrk)\n", mi.arena);
 	rprintf(FINFO, "  ordblks:   %10d   (chunks not in use)\n", mi.ordblks);
 	rprintf(FINFO, "  smblks:    %10d\n", mi.smblks);
@@ -305,8 +307,6 @@ oom:
 }
 
 
-
-
 static char *get_local_name(struct file_list *flist,char *name)
 {
 	STRUCT_STAT st;
@@ -455,6 +455,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 			msleep(20);
 	}
 
+	am_generator = 1;
+
 	close(error_pipe[1]);
 	if (f_in != f_out) close(f_in);
 
@@ -1011,6 +1013,8 @@ int main(int argc,char *argv[])
 	 * that implement getcwd that way "pwd" can't be found after chroot. */
 	push_dir(NULL);
 
+	init_flist();
+
 	if (write_batch && !am_server) {
 		write_batch_argvs_file(orig_argc, orig_argv);
 	}
@@ -1026,13 +1030,6 @@ int main(int argc,char *argv[])
 	if (dry_run)
 		verbose = MAX(verbose,1);
 
-#ifndef SUPPORT_LINKS
-	if (!am_server && preserve_links) {
-		rprintf(FERROR,"ERROR: symbolic links not supported\n");
-		exit_cleanup(RERR_UNSUPPORTED);
-	}
-#endif
-
 	if (am_server) {
 		set_nonblocking(STDIN_FILENO);
 		set_nonblocking(STDOUT_FILENO);