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;
**/
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;
/* 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);
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (DEBUG_GTE(EXIT, 1)) {
rprintf(FINFO,
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (exit_code && exit_code != RERR_SOCKETIO && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
- && !shutting_down && (protocol_version >= 31 || (!am_sender && !am_generator))) {
+ && 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",
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (am_server && code)
msleep(100);