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 05f3452..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
@@ -27,16 +28,38 @@ int cleanup_got_literal=0;
 static char *cleanup_fname;
 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;
+
+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;
                cleanup_fname = NULL;
+               if (cleanup_buf) unmap_file(cleanup_buf);
+               if (cleanup_fd1 != -1) close(cleanup_fd1);
+               if (cleanup_fd2 != -1) close(cleanup_fd2);
                finish_transfer(cleanup_new_fname, fname, cleanup_file);
        }
        io_flush();
@@ -45,6 +68,19 @@ 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 == 0 && (io_error || log_got_error)) {
+               code = RERR_PARTIAL;
+       }
+
+       if (code) log_exit(code, file, line);
+
        exit(code);
 }
 
@@ -55,9 +91,18 @@ void cleanup_disable(void)
 }
 
 
-void cleanup_set(char *fnametmp, char *fname, struct file_struct *file)
+void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
+                struct map_struct *buf, int fd1, int fd2)
 {
        cleanup_fname = fnametmp;
        cleanup_new_fname = fname;
        cleanup_file = file;
+       cleanup_buf = buf;
+       cleanup_fd1 = fd1;
+       cleanup_fd2 = fd2;
+}
+
+void cleanup_set_pid(int pid)
+{
+       cleanup_pid = pid;
 }