New logging categories added to allow differentiation between

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 6fc7225..63fd64e 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -26,7 +26,7 @@ extern int am_server;
 extern int am_daemon;
 extern int io_error;
 extern int keep_partial;
-extern int log_got_error;
+extern int got_xfer_error;
 extern char *partial_dir;
 extern char *logfile_name;
 
@@ -78,8 +78,8 @@ void close_all(void)
  **/
 int cleanup_got_literal = 0;
 
-static char *cleanup_fname;
-static char *cleanup_new_fname;
+static const char *cleanup_fname;
+static const char *cleanup_new_fname;
 static struct file_struct *cleanup_file;
 static int cleanup_fd_r, cleanup_fd_w;
 static pid_t cleanup_pid = 0;
@@ -103,6 +103,11 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
        if (exit_code) /* Preserve first error code when recursing. */
                code = exit_code;
 
+       /* If this is the exit at the end of the run, the server side
+        * should not attempt to output a message (see log.c). */
+       if (am_server && code == 0)
+               am_server = 2;
+
        /* Some of our actions might cause a recursive call back here, so we
         * keep track of where we are in the cleanup and never repeat a step. */
        switch (cleanup_step) {
@@ -134,7 +139,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 
                if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
                 && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
-                       char *fname = cleanup_fname;
+                       const char *fname = cleanup_fname;
                        cleanup_fname = NULL;
                        if (cleanup_fd_r != -1)
                                close(cleanup_fd_r);
@@ -169,7 +174,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
                                code = exit_code = RERR_DEL_LIMIT;
                        if (io_error & IOERR_VANISHED)
                                code = exit_code = RERR_VANISHED;
-                       if (io_error & IOERR_GENERAL || log_got_error)
+                       if (io_error & IOERR_GENERAL || got_xfer_error)
                                code = exit_code = RERR_PARTIAL;
                }
 
@@ -208,7 +213,7 @@ void cleanup_disable(void)
 }
 
 
-void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
+void cleanup_set(const char *fnametmp, const char *fname, struct file_struct *file,
                 int fd_r, int fd_w)
 {
        cleanup_fname = fnametmp;