X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9b73d1c0e9ca979700493337d0a87497b882d811..6c65e14634d9d2a7b103fe53aa7585b196c38227:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index ee2fa4d5..480c2009 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -1,5 +1,6 @@
-/* 
-   Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+   
+   Copyright (C) 1996-2000 by Andrew Tridgell
    Copyright (C) Paul Mackerras 1996
    
    This program is free software; you can redistribute it and/or modify
@@ -30,12 +31,28 @@ 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;
+
+pid_t cleanup_child_pid = -1;
 
-void exit_cleanup(int code)
+/*
+ * Code is one of the RERR_* codes from errcode.h.
+ */
+void _exit_cleanup(int code, const char *file, int line)
 {
 	extern int keep_partial;
+	extern int log_got_error;
 
 	signal(SIGUSR1, SIG_IGN);
+	signal(SIGUSR2, SIG_IGN);
+
+	if (cleanup_child_pid != -1) {
+		int status;
+		if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) {
+			status = WEXITSTATUS(status);
+			if (status > code) code = status;
+		}
+	}
 
 	if (cleanup_got_literal && cleanup_fname && keep_partial) {
 		char *fname = cleanup_fname;
@@ -58,7 +75,11 @@ void exit_cleanup(int code)
 		}
 	}
 
-	if (code) log_exit(code);
+	if (code == 0 && (io_error || log_got_error)) {
+		code = RERR_PARTIAL;
+	}
+
+	if (code) log_exit(code, file, line);
 
 	exit(code);
 }