Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some minor variable and flag cleanup.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
63118e6
..
cf5f212
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-24,8
+24,7
@@
extern int am_server;
extern int am_daemon;
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 int io_error;
extern int keep_partial;
extern int got_xfer_error;
@@
-34,6
+33,8
@@
extern int output_needs_newline;
extern char *partial_dir;
extern char *logfile_name;
extern char *partial_dir;
extern char *logfile_name;
+BOOL shutting_down = False;
+
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
#endif
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
#endif
@@
-97,7
+98,7
@@
pid_t cleanup_child_pid = -1;
**/
NORETURN void _exit_cleanup(int code, const char *file, int line)
{
**/
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;
static int exit_code = 0, exit_line = 0;
static const char *exit_file = NULL;
static int unmodified_code = 0;
@@
-118,8
+119,9
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
/* 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. */
/* 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;
exit_code = unmodified_code = code;
exit_file = file;
@@
-132,12
+134,13
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
if (DEBUG_GTE(EXIT, 2)) {
rprintf(FINFO,
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 */
#include "case_N.h"
}
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (cleanup_child_pid != -1) {
int status;
if (cleanup_child_pid != -1) {
int status;
@@
-151,6
+154,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
/* FALLTHROUGH */
#include "case_N.h"
/* 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)) {
if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
&& keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
@@
-168,12
+172,14
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
/* FALLTHROUGH */
#include "case_N.h"
/* 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"
io_flush(FULL_FLUSH);
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (cleanup_fname)
do_unlink(cleanup_fname);
if (cleanup_fname)
do_unlink(cleanup_fname);
@@
-202,26
+208,34
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
/* FALLTHROUGH */
#include "case_N.h"
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (DEBUG_GTE(EXIT, 1)) {
rprintf(FINFO,
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",
"about to call exit(%d)\n",
- unmodified_code, file, line, code);
+
who_am_i(),
unmodified_code, file, line, code);
}
/* FALLTHROUGH */
#include "case_N.h"
}
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (exit_code && exit_code != RERR_SOCKETIO && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1
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);
send_msg_int(MSG_ERROR_EXIT, exit_code);
+ }
noop_io_until_death();
}
/* FALLTHROUGH */
#include "case_N.h"
noop_io_until_death();
}
/* FALLTHROUGH */
#include "case_N.h"
+ switch_step++;
if (am_server && code)
msleep(100);
if (am_server && code)
msleep(100);