X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/12fa790ea0e2b0ef52b0ac0189c6ebd6c8692a1e..2873603ab5e7451ad8fd3ee75b859d709ae0378a:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index b1bf256d..9cf7be0f 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -1,30 +1,39 @@
-/* -*- c-file-style: "linux" -*-
-
-   Copyright (C) 1996-2000 by Andrew Tridgell
-   Copyright (C) Paul Mackerras 1996
-   Copyright (C) 2002 by Martin Pool
-
-   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
-   (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
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/*
+ * End-of-run cleanup routines.
+ *
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2002 Martin Pool
+ * Copyright (C) 2003, 2004, 2005, 2006 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
+ * (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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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.
+ */
 
 #include "rsync.h"
 
+extern int am_server;
+extern int am_daemon;
 extern int io_error;
 extern int keep_partial;
 extern int log_got_error;
 extern char *partial_dir;
+extern char *logfile_name;
+
+#ifdef HAVE_SIGACTION
+static struct sigaction sigact;
+#endif
 
 /**
  * Close all open sockets and files, allowing a (somewhat) graceful
@@ -94,8 +103,8 @@ void _exit_cleanup(int code, const char *file, int line)
 	}
 	inside_cleanup++;
 
-	signal(SIGUSR1, SIG_IGN);
-	signal(SIGUSR2, SIG_IGN);
+	SIGACTION(SIGUSR1, SIG_IGN);
+	SIGACTION(SIGUSR2, SIG_IGN);
 
 	if (verbose > 3) {
 		rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
@@ -104,14 +113,15 @@ void _exit_cleanup(int code, const char *file, int line)
 
 	if (cleanup_child_pid != -1) {
 		int status;
-		if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) {
+		if (wait_process(cleanup_child_pid, &status, WNOHANG)
+		 == cleanup_child_pid) {
 			status = WEXITSTATUS(status);
 			if (status > code)
 				code = status;
 		}
 	}
 
-	if (cleanup_got_literal && cleanup_fname && keep_partial
+	if (cleanup_got_literal && cleanup_new_fname && keep_partial
 	    && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
 		char *fname = cleanup_fname;
 		cleanup_fname = NULL;
@@ -144,7 +154,7 @@ void _exit_cleanup(int code, const char *file, int line)
 			code = RERR_PARTIAL;
 	}
 
-	if (code)
+	if (code || am_daemon || (logfile_name && (am_server || !verbose)))
 		log_exit(code, file, line);
 
 	if (verbose > 2) {
@@ -158,7 +168,7 @@ void _exit_cleanup(int code, const char *file, int line)
 
 void cleanup_disable(void)
 {
-	cleanup_fname = NULL;
+	cleanup_fname = cleanup_new_fname = NULL;
 	cleanup_got_literal = 0;
 }
 
@@ -166,8 +176,8 @@ void cleanup_disable(void)
 void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
 		 int fd_r, int fd_w)
 {
-	cleanup_fname = fname ? fnametmp : NULL;
-	cleanup_new_fname = fname;
+	cleanup_fname = fnametmp;
+	cleanup_new_fname = fname; /* can be NULL on a partial-dir failure */
 	cleanup_file = file;
 	cleanup_fd_r = fd_r;
 	cleanup_fd_w = fd_w;