Rearrange code slightly to avoid util.c depending on main.c.

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index bd562ae..be2dd7d 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -33,19 +33,32 @@ static struct map_struct *cleanup_buf;
 static int cleanup_pid = 0;
 extern int io_error;
 
+pid_t cleanup_child_pid = -1;
 
 /*
  * Code is one of the RERR_* codes from errcode.h.
  */
 void _exit_cleanup(int code, const char *file, int line)
 {
+       int ocode = code;
        extern int keep_partial;
-
-       if (code == 0 && io_error) code = RERR_FILEIO;
+       extern int log_got_error;
 
        signal(SIGUSR1, SIG_IGN);
        signal(SIGUSR2, SIG_IGN);
 
+       if (verbose > 3)
+               rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", 
+                       code, file, line);
+
+       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;
                cleanup_fname = NULL;
@@ -67,8 +80,16 @@ void _exit_cleanup(int code, const char *file, int line)
                }
        }
 
+       if (code == 0 && (io_error || log_got_error)) {
+               code = RERR_PARTIAL;
+       }
+
        if (code) log_exit(code, file, line);
 
+       if (verbose > 2)
+               rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", 
+                       ocode, file, line, code);
+
        exit(code);
 }