X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b765ec32b93d8fa78f19a48fbc7cc9066beb488e..9935066b704bcf2e6e48dac85cb1b4047d8f439d:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index b9e9dabe..779f284c 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -21,6 +21,32 @@
 
 #include "rsync.h"
 
+/**
+ * Close all open sockets and files, allowing a (somewhat) graceful
+ * shutdown() of socket connections.  This eliminates the abortive
+ * TCP RST sent by a Winsock-based system when the close() occurs.
+ **/
+void close_all(void)
+{
+#ifdef SHUTDOWN_ALL_SOCKETS
+	int max_fd;
+	int fd;
+	int ret;
+	struct stat st;
+
+	max_fd = sysconf(_SC_OPEN_MAX) - 1;
+	for (fd = max_fd; fd >= 0; fd--) {
+		ret = fstat(fd,&st);
+		if (fstat(fd,&st) == 0) {
+			if (is_a_socket(fd)) {
+				ret = shutdown(fd, 2);
+			}
+			ret = close(fd);
+		}
+	}
+#endif
+}
+
 /**
  * @file cleanup.c
  *
@@ -46,7 +72,7 @@ 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;
+static pid_t cleanup_pid = 0;
 extern int io_error;
 
 pid_t cleanup_child_pid = -1;
@@ -63,11 +89,11 @@ void _exit_cleanup(int code, const char *file, int line)
 	extern int log_got_error;
 	static int inside_cleanup = 0;
 
-	if (inside_cleanup != 0) {
+	if (inside_cleanup > 10) {
 		/* prevent the occasional infinite recursion */
 		return;
 	}
-	inside_cleanup = 1;
+	inside_cleanup++;
 
 	signal(SIGUSR1, SIG_IGN);
 	signal(SIGUSR2, SIG_IGN);
@@ -92,21 +118,24 @@ void _exit_cleanup(int code, const char *file, int line)
 		if (cleanup_fd2 != -1) close(cleanup_fd2);
 		finish_transfer(cleanup_new_fname, fname, cleanup_file);
 	}
-	io_flush();
+	io_flush(FULL_FLUSH);
 	if (cleanup_fname)
 		do_unlink(cleanup_fname);
 	if (code) {
 		kill_all(SIGUSR1);
 	}
-	if ((cleanup_pid != 0) && (cleanup_pid == (int) getpid())) {
+	if (cleanup_pid && cleanup_pid == 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 == 0) {
+		if ((io_error & ~IOERR_VANISHED) || log_got_error)
+			code = RERR_PARTIAL;
+		else if (io_error)
+			code = RERR_VANISHED;
 	}
 
 	if (code) log_exit(code, file, line);
@@ -115,6 +144,7 @@ void _exit_cleanup(int code, const char *file, int line)
 		rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", 
 			ocode, file, line, code);
 
+	close_all();
 	exit(code);
 }
 
@@ -136,7 +166,7 @@ void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
 	cleanup_fd2 = fd2;
 }
 
-void cleanup_set_pid(int pid)
+void cleanup_set_pid(pid_t pid)
 {
 	cleanup_pid = pid;
 }