* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2013 Wayne Davison
+ * Copyright (C) 2003-2020 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
#include "rsync.h"
+extern int dry_run;
extern int am_server;
extern int am_daemon;
extern int am_receiver;
+extern int am_sender;
extern int io_error;
extern int keep_partial;
extern int got_xfer_error;
extern char *partial_dir;
extern char *logfile_name;
+int called_from_signal_handler = 0;
BOOL shutting_down = False;
BOOL flush_ok_after_signal = False;
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 int cleanup_fd_r = -1, cleanup_fd_w = -1;
static pid_t cleanup_pid = 0;
pid_t cleanup_child_pid = -1;
if (DEBUG_GTE(EXIT, 2)) {
rprintf(FINFO,
"[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- who_am_i(), code, file, line);
+ who_am_i(), code, src_file(file), line);
}
- /* FALLTHROUGH */
#include "case_N.h"
switch_step++;
}
}
- /* FALLTHROUGH */
#include "case_N.h"
switch_step++;
- if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
- && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
- int tweak_modtime = 0;
- const char *fname = cleanup_fname;
- cleanup_fname = NULL;
- if (cleanup_fd_r != -1)
+ if (cleanup_got_literal && (cleanup_fname || cleanup_fd_w != -1)) {
+ if (cleanup_fd_r != -1) {
close(cleanup_fd_r);
+ cleanup_fd_r = -1;
+ }
if (cleanup_fd_w != -1) {
flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
+ cleanup_fd_w = -1;
}
- if (!partial_dir) {
- /* We don't want to leave a partial file with a modern time or it
- * could be skipped via --update. Setting the time to something
- * really old also helps it to stand out as unfinished in an ls. */
- tweak_modtime = 1;
- cleanup_file->modtime = 0;
+ if (cleanup_fname && cleanup_new_fname && keep_partial
+ && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
+ int tweak_modtime = 0;
+ const char *fname = cleanup_fname;
+ cleanup_fname = NULL;
+ if (!partial_dir) {
+ /* We don't want to leave a partial file with a modern time or it
+ * could be skipped via --update. Setting the time to something
+ * really old also helps it to stand out as unfinished in an ls. */
+ tweak_modtime = 1;
+ cleanup_file->modtime = 0;
+ }
+ finish_transfer(cleanup_new_fname, fname, NULL, NULL,
+ cleanup_file, tweak_modtime, !partial_dir);
}
- finish_transfer(cleanup_new_fname, fname, NULL, NULL,
- cleanup_file, tweak_modtime, !partial_dir);
}
- /* FALLTHROUGH */
#include "case_N.h"
switch_step++;
if (!exit_code && !code)
io_flush(FULL_FLUSH);
- /* FALLTHROUGH */
#include "case_N.h"
switch_step++;
/* If line < 0, this exit is after a MSG_ERROR_EXIT event, so
* we don't want to output a duplicate error. */
if ((exit_code && line > 0)
- || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1))))
+ || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1)))) {
log_exit(exit_code, exit_file, exit_line);
+ }
- /* FALLTHROUGH */
#include "case_N.h"
switch_step++;
if (DEBUG_GTE(EXIT, 1)) {
rprintf(FINFO,
"[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
- "about to call exit(%d)\n",
- who_am_i(), first_code, exit_file, exit_line, exit_code);
+ "about to call exit(%d)%s\n",
+ who_am_i(), first_code, exit_file, exit_line, exit_code,
+ dry_run ? " (DRY RUN)" : "");
}
- /* FALLTHROUGH */
#include "case_N.h"
switch_step++;
if (exit_code && exit_code != RERR_SOCKETIO && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
- && exit_code != RERR_TIMEOUT && !shutting_down && (protocol_version >= 31 || am_receiver)) {
- if (line > 0) {
- if (DEBUG_GTE(EXIT, 3)) {
- rprintf(FINFO, "[%s] sending MSG_ERROR_EXIT with exit_code %d\n",
- who_am_i(), exit_code);
+ && exit_code != RERR_TIMEOUT && !shutting_down) {
+ if (protocol_version >= 31 || am_receiver) {
+ if (line > 0) {
+ if (DEBUG_GTE(EXIT, 3)) {
+ rprintf(FINFO, "[%s] sending MSG_ERROR_EXIT with exit_code %d\n",
+ who_am_i(), exit_code);
+ }
+ send_msg_int(MSG_ERROR_EXIT, exit_code);
}
- send_msg_int(MSG_ERROR_EXIT, exit_code);
+ if (!am_sender)
+ io_flush(MSG_FLUSH); /* Be sure to send all messages */
+ noop_io_until_death();
}
- noop_io_until_death();
+ else if (!am_sender)
+ io_flush(MSG_FLUSH); /* Be sure to send all messages */
}
- /* FALLTHROUGH */
#include "case_N.h"
switch_step++;
break;
}
+ if (called_from_signal_handler)
+ _exit(exit_code);
exit(exit_code);
}
void cleanup_disable(void)
{
cleanup_fname = cleanup_new_fname = NULL;
+ cleanup_fd_r = cleanup_fd_w = -1;
cleanup_got_literal = 0;
}
git.samba.org / rsync.git / blobdiff