* 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-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 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,
* 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"
extern int am_server;
extern int am_daemon;
+extern int am_sender;
+extern int am_generator;
extern int io_error;
extern int keep_partial;
-extern int log_got_error;
+extern int got_xfer_error;
+extern int protocol_version;
+extern int output_needs_newline;
extern char *partial_dir;
extern char *logfile_name;
**/
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;
pid_t cleanup_child_pid = -1;
-int in_exit_cleanup = 0;
-
/**
* Eventually calls exit(), passing @p code, therefore does not return.
*
**/
NORETURN void _exit_cleanup(int code, const char *file, int line)
{
- int ocode = code;
+ static int cleanup_step = 0;
+ static int exit_code = 0, exit_line = 0;
+ static const char *exit_file = NULL;
+ static int unmodified_code = 0;
SIGACTION(SIGUSR1, SIG_IGN);
SIGACTION(SIGUSR2, SIG_IGN);
- in_exit_cleanup = 1;
-
- if (verbose > 3) {
- rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- code, file, line);
+ if (exit_code) { /* Preserve first exit info when recursing. */
+ code = exit_code;
+ file = exit_file;
+ line = exit_line;
}
- if (cleanup_child_pid != -1) {
- int status;
- if (wait_process(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) {
- status = WEXITSTATUS(status);
- if (status > code)
- code = status;
+ /* 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++; */
+
+ exit_code = unmodified_code = code;
+ exit_file = file;
+ exit_line = line;
+
+ if (output_needs_newline) {
+ fputc('\n', stdout);
+ output_needs_newline = 0;
}
- }
- if (cleanup_got_literal && cleanup_fname && cleanup_new_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, NULL,
- 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_DEL_LIMIT)
- code = RERR_DEL_LIMIT;
- if (io_error & IOERR_VANISHED)
- code = RERR_VANISHED;
- if (io_error & IOERR_GENERAL || log_got_error)
- code = RERR_PARTIAL;
- }
+ /* 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"
+
+ if (!code || am_server || (!am_sender && !am_generator))
+ 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 line < 0, this exit is after a MSG_ERROR_EXIT event, so
+ * we don't want to output a duplicate error. */
+ if ((code && line > 0)
+ || 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 (exit_code && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
+ && (protocol_version >= 31 || (!am_sender && !am_generator))) {
+ if (line > 0)
+ send_msg_int(MSG_ERROR_EXIT, exit_code);
+ noop_io_until_death();
+ }
+
+ /* FALLTHROUGH */
+#include "case_N.h"
- if (code || am_daemon || (logfile_name && (am_server || !verbose)))
- 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_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;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff