X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a0f1ed55cd5ae7393b904b2e2bd31c2ee0b59d40..2885270b52e4fd6c5daa1ed60f657c808d6cb504:/main.c diff --git a/main.c b/main.c index 00da2db9..a2bf0107 100644 --- a/main.c +++ b/main.c @@ -73,6 +73,8 @@ extern int send_msgs_to_gen; extern pid_t cleanup_child_pid; extern size_t bwlimit_writemax; extern unsigned int module_dirlen; +extern BOOL flist_receiving_enabled; +extern BOOL shutting_down; extern struct stats stats; extern char *stdout_format; extern char *logfile_format; @@ -404,7 +406,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in cmd = rsh_env; if (!cmd) cmd = RSYNC_RSH; - cmd = strdup(cmd); /* MEMORY LEAK */ + cmd = strdup(cmd); /*MEMORY LEAK*/ if (!cmd) goto oom; @@ -726,6 +728,8 @@ static void read_final_goodbye(int f_in, int f_out) uchar fnamecmp_type; char xname[MAXPATHLEN]; + shutting_down = True; + if (protocol_version < 29) i = read_int(f_in); else { @@ -895,6 +899,7 @@ static int do_recv(int f_in, int f_out, char *local_name) } am_generator = 1; + flist_receiving_enabled = True; io_end_multiplex_in(MPLX_SWITCHING); if (write_batch && !am_server) @@ -921,6 +926,7 @@ static int do_recv(int f_in, int f_out, char *local_name) handle_stats(-1); io_flush(FULL_FLUSH); + shutting_down = True; if (protocol_version >= 24) { /* send a final goodbye message */ write_ndx(f_out, NDX_DONE);