extern int am_server;
extern int am_daemon;
-extern int am_sender;
-extern int am_generator;
+extern int am_receiver;
extern int io_error;
extern int keep_partial;
extern int got_xfer_error;
extern char *partial_dir;
extern char *logfile_name;
+BOOL shutting_down = False;
+
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
#endif
**/
NORETURN void _exit_cleanup(int code, const char *file, int line)
{
- static int cleanup_step = 0;
+ static int switch_step = 0;
static int exit_code = 0, exit_line = 0;
static const char *exit_file = NULL;
static int unmodified_code = 0;
/* 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++; */
+ switch (switch_step) {
+#include "case_N.h" /* case 0: */
+ switch_step++;
exit_code = unmodified_code = code;
exit_file = file;
if (DEBUG_GTE(EXIT, 2)) {
rprintf(FINFO,
- "_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- code, file, line);
- }
-
- /* FALLTHROUGH */
-#include "case_N.h"
-
- if (exit_code && exit_code != RERR_RCVR_ERROR
- && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
- && (protocol_version >= 31 || (!am_sender && !am_generator))) {
- send_msg_int(MSG_ERROR_EXIT, exit_code);
- if (am_server && !am_sender && !am_generator)
- noop_io_until_death();
+ "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
+ who_am_i(), code, file, line);
}
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (cleanup_child_pid != -1) {
int status;
/* 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)) {
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
- if (!code || am_server || (!am_sender && !am_generator))
+ if (!code || am_server || am_receiver)
io_flush(FULL_FLUSH);
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (cleanup_fname)
do_unlink(cleanup_fname);
code = exit_code = RERR_PARTIAL;
}
- if ((code && code != RERR_RCVR_ERROR)
+ /* 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"
+ switch_step++;
if (DEBUG_GTE(EXIT, 1)) {
rprintf(FINFO,
- "_exit_cleanup(code=%d, file=%s, line=%d): "
+ "[%s] _exit_cleanup(code=%d, file=%s, line=%d): "
"about to call exit(%d)\n",
- unmodified_code, file, line, code);
+ who_am_i(), unmodified_code, file, line, code);
+ }
+
+ /* 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);
+ }
+ send_msg_int(MSG_ERROR_EXIT, exit_code);
+ }
+ noop_io_until_death();
}
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (am_server && code)
msleep(100);