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
if (DEBUG_GTE(EXIT, 2)) {
rprintf(FINFO,
- "_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- code, file, line);
+ "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n",
+ who_am_i(), code, file, line);
}
/* FALLTHROUGH */
/* FALLTHROUGH */
#include "case_N.h"
- if (!code || am_server || (!am_sender && !am_generator))
+ if (!code || am_server || am_receiver)
io_flush(FULL_FLUSH);
/* FALLTHROUGH */
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"
if (exit_code && exit_code != RERR_SOCKETIO && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
- && (protocol_version >= 31 || (!am_sender && !am_generator))) {
- if (line > 0)
+ && 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();
}