diff options
author | Wayne Davison <wayned@samba.org> | 2009-12-12 08:54:36 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2009-12-12 08:54:36 -0800 |
commit | 0c2e8f93643fd94a8d388e4373c30331d0af75b4 (patch) | |
tree | ecabea325285f7094fab5adf98e68b53f41af734 /cleanup.c | |
parent | 24079e988fc31af4eba56cd2701fdc5a4154980d (diff) | |
download | android_external_rsync-0c2e8f93643fd94a8d388e4373c30331d0af75b4.tar.gz android_external_rsync-0c2e8f93643fd94a8d388e4373c30331d0af75b4.tar.bz2 android_external_rsync-0c2e8f93643fd94a8d388e4373c30331d0af75b4.zip |
Don't send MSG_ERROR_EXIT messages at the end of the transfer.
Added some debug output for MSG_ERROR_EXIT messages.
Diffstat (limited to 'cleanup.c')
-rw-r--r-- | cleanup.c | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -34,6 +34,8 @@ extern int output_needs_newline; extern char *partial_dir; extern char *logfile_name; +BOOL shutting_down = False; + #ifdef HAVE_SIGACTION static struct sigaction sigact; #endif @@ -132,8 +134,8 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) 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 */ @@ -205,18 +207,23 @@ NORETURN void _exit_cleanup(int code, const char *file, int line) 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) + && !shutting_down && (protocol_version >= 31 || (!am_sender && !am_generator))) { + 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(); } |