-/* -*- 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-2009 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 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
+ * 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, visit the http://fsf.org website.
+ */
#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 int got_xfer_error;
+extern int output_needs_newline;
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
**/
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;
*
* @param code one of the RERR_* codes from errcode.h.
**/
-void _exit_cleanup(int code, const char *file, int line)
+NORETURN void _exit_cleanup(int code, const char *file, int line)
{
- int ocode = code;
- static int inside_cleanup = 0;
+ static int cleanup_step = 0;
+ static int exit_code = 0;
+ static int unmodified_code = 0;
- if (inside_cleanup > 10) {
- /* prevent the occasional infinite recursion */
- return;
- }
- inside_cleanup++;
+ SIGACTION(SIGUSR1, SIG_IGN);
+ SIGACTION(SIGUSR2, SIG_IGN);
- signal(SIGUSR1, SIG_IGN);
- signal(SIGUSR2, SIG_IGN);
+ if (exit_code) /* Preserve first error code when recursing. */
+ code = exit_code;
- if (verbose > 3) {
- rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- code, file, line);
- }
+ /* If this is the exit at the end of the run, the server side
+ * should not attempt to output a message (see log_exit()). */
+ 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) {
+#include "case_N.h" /* case 0: cleanup_step++; */
- 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;
+ exit_code = unmodified_code = code;
+
+ if (output_needs_newline) {
+ fputc('\n', stdout);
+ output_needs_newline = 0;
}
- }
- if (cleanup_got_literal && cleanup_fname && keep_partial
- && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
- char *fname = cleanup_fname;
- cleanup_fname = NULL;
- if (cleanup_fd_r != -1)
- close(cleanup_fd_r);
- if (cleanup_fd_w != -1) {
- flush_write_file(cleanup_fd_w);
- close(cleanup_fd_w);
+ if (DEBUG_GTE(EXIT, 2)) {
+ rprintf(FINFO,
+ "_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
+ code, file, line);
}
- finish_transfer(cleanup_new_fname, fname, cleanup_file, 0,
- !partial_dir);
- }
- io_flush(FULL_FLUSH);
- if (cleanup_fname)
- do_unlink(cleanup_fname);
- if (code)
- kill_all(SIGUSR1);
- if (cleanup_pid && cleanup_pid == getpid()) {
- char *pidf = lp_pid_file();
- if (pidf && *pidf)
- unlink(lp_pid_file());
- }
- if (code == 0) {
- if ((io_error & ~IOERR_VANISHED) || log_got_error)
- code = RERR_PARTIAL;
- else if (io_error)
- code = RERR_VANISHED;
- }
+ /* FALLTHROUGH */
+#include "case_N.h"
+
+ if (cleanup_child_pid != -1) {
+ int status;
+ int pid = wait_process(cleanup_child_pid, &status, WNOHANG);
+ if (pid == cleanup_child_pid) {
+ status = WEXITSTATUS(status);
+ if (status > code)
+ code = exit_code = status;
+ }
+ }
+
+ /* FALLTHROUGH */
+#include "case_N.h"
+
+ if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
+ && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
+ const char *fname = cleanup_fname;
+ cleanup_fname = NULL;
+ if (cleanup_fd_r != -1)
+ close(cleanup_fd_r);
+ if (cleanup_fd_w != -1) {
+ flush_write_file(cleanup_fd_w);
+ close(cleanup_fd_w);
+ }
+ finish_transfer(cleanup_new_fname, fname, NULL, NULL,
+ cleanup_file, 0, !partial_dir);
+ }
+
+ /* FALLTHROUGH */
+#include "case_N.h"
+
+ io_flush(FULL_FLUSH);
+
+ /* FALLTHROUGH */
+#include "case_N.h"
+
+ if (cleanup_fname)
+ do_unlink(cleanup_fname);
+ if (code)
+ kill_all(SIGUSR1);
+ if (cleanup_pid && cleanup_pid == getpid()) {
+ char *pidf = lp_pid_file();
+ if (pidf && *pidf)
+ unlink(lp_pid_file());
+ }
+
+ if (code == 0) {
+ if (io_error & IOERR_DEL_LIMIT)
+ code = exit_code = RERR_DEL_LIMIT;
+ if (io_error & IOERR_VANISHED)
+ code = exit_code = RERR_VANISHED;
+ if (io_error & IOERR_GENERAL || got_xfer_error)
+ code = exit_code = RERR_PARTIAL;
+ }
+
+ if (code || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1))))
+ log_exit(code, file, line);
+
+ /* FALLTHROUGH */
+#include "case_N.h"
+
+ if (DEBUG_GTE(EXIT, 1)) {
+ rprintf(FINFO,
+ "_exit_cleanup(code=%d, file=%s, line=%d): "
+ "about to call exit(%d)\n",
+ unmodified_code, file, line, code);
+ }
+
+ /* FALLTHROUGH */
+#include "case_N.h"
- if (code)
- log_exit(code, file, line);
+ if (am_server && code)
+ msleep(100);
+ close_all();
- if (verbose > 2) {
- rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
- ocode, file, line, code);
+ /* FALLTHROUGH */
+ default:
+ break;
}
- close_all();
exit(code);
}
void cleanup_disable(void)
{
- cleanup_fname = NULL;
+ cleanup_fname = cleanup_new_fname = NULL;
cleanup_got_literal = 0;
}
-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;
- cleanup_new_fname = fname;
+ 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;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff