X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/154c345db03bd0c5a93a28373352c9d9363d587b..3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index df8c95bd..63fd64ef 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -4,11 +4,11 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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,
@@ -17,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"
@@ -27,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;
 
@@ -79,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;
@@ -104,11 +103,15 @@ 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) {
-	case 0:
-		cleanup_step++;
+#include "case_N.h" /* case 0: cleanup_step++; */
 
 		exit_code = unmodified_code = code;
 
@@ -119,8 +122,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 		}
 
 		/* FALLTHROUGH */
-	case 1:
-		cleanup_step++;
+#include "case_N.h"
 
 		if (cleanup_child_pid != -1) {
 			int status;
@@ -133,12 +135,11 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 		}
 
 		/* FALLTHROUGH */
-	case 2:
-		cleanup_step++;
+#include "case_N.h"
 
 		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);
@@ -146,19 +147,17 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 				flush_write_file(cleanup_fd_w);
 				close(cleanup_fd_w);
 			}
-			finish_transfer(cleanup_new_fname, fname, NULL,
+			finish_transfer(cleanup_new_fname, fname, NULL, NULL,
 					cleanup_file, 0, !partial_dir);
 		}
 
 		/* FALLTHROUGH */
-	case 3:
-		cleanup_step++;
+#include "case_N.h"
 
 		io_flush(FULL_FLUSH);
 
 		/* FALLTHROUGH */
-	case 4:
-		cleanup_step++;
+#include "case_N.h"
 
 		if (cleanup_fname)
 			do_unlink(cleanup_fname);
@@ -175,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;
 		}
 
@@ -183,8 +182,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 			log_exit(code, file, line);
 
 		/* FALLTHROUGH */
-	case 5:
-		cleanup_step++;
+#include "case_N.h"
 
 		if (verbose > 2) {
 			rprintf(FINFO,
@@ -194,9 +192,10 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 		}
 
 		/* FALLTHROUGH */
-	case 6:
-		cleanup_step++;
+#include "case_N.h"
 
+		if (am_server && code)
+			msleep(100);
 		close_all();
 
 		/* FALLTHROUGH */
@@ -214,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;