Split code to generate "rwx-----" strings into lib/permstring.c so it

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index be79503..480c200 100644 (file)
--- 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;
 
+/*
+ * 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,6 +75,10 @@ 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);
 
        exit(code);