X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f9185203ee03152001530db5624a2b8c93e1ea94..ae598f3847bd83b81effb6cc38719e790ed4c1cf:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 4ff5b9c0..ae185d47 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -98,14 +98,18 @@ pid_t cleanup_child_pid = -1;
 NORETURN void _exit_cleanup(int code, const char *file, int line)
 {
 	static int cleanup_step = 0;
-	static int exit_code = 0;
+	static int exit_code = 0, exit_line = 0;
+	static const char *exit_file = NULL;
 	static int unmodified_code = 0;
 
 	SIGACTION(SIGUSR1, SIG_IGN);
 	SIGACTION(SIGUSR2, SIG_IGN);
 
-	if (exit_code) /* Preserve first error code when recursing. */
+	if (exit_code) { /* Preserve first exit info when recursing. */
 		code = exit_code;
+		file = exit_file;
+		line = exit_line;
+	}
 
 	/* If this is the exit at the end of the run, the server side
 	 * should not attempt to output a message (see log_exit()). */
@@ -118,6 +122,8 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 #include "case_N.h" /* case 0: cleanup_step++; */
 
 		exit_code = unmodified_code = code;
+		exit_file = file;
+		exit_line = line;
 
 		if (output_needs_newline) {
 			fputc('\n', stdout);
@@ -130,17 +136,6 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 				code, file, line);
 		}
 
-		/* FALLTHROUGH */
-#include "case_N.h"
-
-		if (exit_code && exit_code != RERR_RCVR_ERROR
-		 && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
-		 && (protocol_version >= 31 || (!am_sender && !am_generator))) {
-			send_msg_int(MSG_ERROR_EXIT, exit_code);
-			if (am_server && !am_sender && !am_generator)
-				noop_io_until_death();
-		}
-
 		/* FALLTHROUGH */
 #include "case_N.h"
 
@@ -199,7 +194,9 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 				code = exit_code = RERR_PARTIAL;
 		}
 
-		if ((code && code != RERR_RCVR_ERROR)
+		/* If line < 0, this exit is after a MSG_ERROR_EXIT event, so
+		 * we don't want to output a duplicate error. */
+		if ((code && line > 0)
 		 || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1))))
 			log_exit(code, file, line);
 
@@ -213,6 +210,16 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 				unmodified_code, file, line, code);
 		}
 
+		/* FALLTHROUGH */
+#include "case_N.h"
+
+		if (exit_code && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
+		 && (protocol_version >= 31 || (!am_sender && !am_generator))) {
+			if (line > 0)
+				send_msg_int(MSG_ERROR_EXIT, exit_code);
+			noop_io_until_death();
+		}
+
 		/* FALLTHROUGH */
 #include "case_N.h"