X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c6b81a9865b49f39f7d388ac64a8d74ce414081e..8b35435f7cc4708400c652434615ce48dc493de4:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 57fce18f..c828d73c 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -29,12 +29,17 @@ static char *cleanup_new_fname;
 static struct file_struct *cleanup_file;
 static int cleanup_fd1, cleanup_fd2;
 static struct map_struct *cleanup_buf;
+static int cleanup_pid = 0;
+extern int io_error;
 
-void exit_cleanup(int code)
+void _exit_cleanup(int code, const char *file, int line)
 {
 	extern int keep_partial;
 
+	if (code == 0 && io_error) code = RERR_FILEIO;
+
 	signal(SIGUSR1, SIG_IGN);
+	signal(SIGUSR2, SIG_IGN);
 
 	if (cleanup_got_literal && cleanup_fname && keep_partial) {
 		char *fname = cleanup_fname;
@@ -50,6 +55,15 @@ void exit_cleanup(int code)
 	if (code) {
 		kill_all(SIGUSR1);
 	}
+	if ((cleanup_pid != 0) && (cleanup_pid == (int) getpid())) {
+		char *pidf = lp_pid_file();
+		if (pidf && *pidf) {
+			unlink(lp_pid_file());
+		}
+	}
+
+	if (code) log_exit(code, file, line);
+
 	exit(code);
 }
 
@@ -70,3 +84,8 @@ void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
 	cleanup_fd1 = fd1;
 	cleanup_fd2 = fd2;
 }
+
+void cleanup_set_pid(int pid)
+{
+	cleanup_pid = pid;
+}