* 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
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* @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;
-
- if (inside_cleanup > 10) {
- /* prevent the occasional infinite recursion */
- return;
- }
- inside_cleanup++;
+ static int cleanup_step = 0;
+ static int exit_code = 0;
+ static int unmodified_code = 0;
SIGACTION(SIGUSR1, SIG_IGN);
SIGACTION(SIGUSR2, SIG_IGN);
- if (verbose > 3) {
- rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- code, file, line);
- }
+ if (exit_code) /* Preserve first error code when recursing. */
+ code = exit_code;
- 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;
+ /* 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;
+
+ if (verbose > 3) {
+ rprintf(FINFO,
+ "_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
+ code, file, line);
}
- }
- if (cleanup_got_literal && 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);
+ /* 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;
+ }
}
- 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_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);
+ }
+ 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 || log_got_error)
+ code = exit_code = RERR_PARTIAL;
+ }
+
+ if (code || am_daemon || (logfile_name && (am_server || !verbose)))
+ log_exit(code, file, line);
+
+ /* FALLTHROUGH */
+#include "case_N.h"
+
+ if (verbose > 2) {
+ 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 || am_daemon || (logfile_name && (am_server || !verbose)))
- log_exit(code, file, line);
+ 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);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff