--- embedaddon/rsync/cleanup.c 2012/02/17 15:09:30 1.1 +++ embedaddon/rsync/cleanup.c 2013/10/14 07:51:14 1.1.1.2 @@ -4,7 +4,7 @@ * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2002 Martin Pool - * Copyright (C) 2003-2009 Wayne Davison + * Copyright (C) 2003-2013 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,9 +28,14 @@ extern int am_receiver; extern int io_error; extern int keep_partial; extern int got_xfer_error; +extern int protocol_version; +extern int output_needs_newline; extern char *partial_dir; extern char *logfile_name; +BOOL shutting_down = False; +BOOL flush_ok_after_signal = False; + #ifdef HAVE_SIGACTION static struct sigaction sigact; #endif @@ -82,7 +87,7 @@ int cleanup_got_literal = 0; static const char *cleanup_fname; static const char *cleanup_new_fname; static struct file_struct *cleanup_file; -static int cleanup_fd_r, cleanup_fd_w; +static int cleanup_fd_r = -1, cleanup_fd_w = -1; static pid_t cleanup_pid = 0; pid_t cleanup_child_pid = -1; @@ -97,15 +102,15 @@ NORETURN void _exit_cleanup(int code, const char *file 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 first_code = 0; SIGACTION(SIGUSR1, SIG_IGN); SIGACTION(SIGUSR2, SIG_IGN); - if (exit_code) { /* Preserve first exit info when recursing. */ - code = exit_code; - file = exit_file; - line = exit_line; + if (!exit_code) { /* Preserve first error exit info when recursing. */ + exit_code = code; + exit_file = file; + exit_line = line < 0 ? -line : line; } /* If this is the exit at the end of the run, the server side @@ -119,11 +124,14 @@ NORETURN void _exit_cleanup(int code, const char *file #include "case_N.h" /* case 0: */ switch_step++; - exit_code = unmodified_code = code; - exit_file = file; - exit_line = line; + first_code = code; - if (verbose > 3) { + if (output_needs_newline) { + fputc('\n', stdout); + output_needs_newline = 0; + } + + if (DEBUG_GTE(EXIT, 2)) { rprintf(FINFO, "[%s] _exit_cleanup(code=%d, file=%s, line=%d): entered\n", who_am_i(), code, file, line); @@ -138,8 +146,8 @@ NORETURN void _exit_cleanup(int code, const char *file int pid = wait_process(cleanup_child_pid, &status, WNOHANG); if (pid == cleanup_child_pid) { status = WEXITSTATUS(status); - if (status > code) - code = exit_code = status; + if (status > exit_code) + exit_code = status; } } @@ -147,25 +155,43 @@ NORETURN void _exit_cleanup(int code, const char *file #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_fd_w != -1)) { const char *fname = cleanup_fname; cleanup_fname = NULL; - if (cleanup_fd_r != -1) + if (cleanup_fd_r != -1) { close(cleanup_fd_r); + cleanup_fd_r = -1; + } if (cleanup_fd_w != -1) { flush_write_file(cleanup_fd_w); close(cleanup_fd_w); + cleanup_fd_w = -1; } - finish_transfer(cleanup_new_fname, fname, NULL, NULL, - cleanup_file, 0, !partial_dir); + if (fname && cleanup_new_fname && keep_partial + && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) { + int tweak_modtime = 0; + if (!partial_dir) { + /* We don't want to leave a partial file with a modern time or it + * could be skipped via --update. Setting the time to something + * really old also helps it to stand out as unfinished in an ls. */ + tweak_modtime = 1; + cleanup_file->modtime = 0; + } + finish_transfer(cleanup_new_fname, fname, NULL, NULL, + cleanup_file, tweak_modtime, !partial_dir); + } } /* FALLTHROUGH */ #include "case_N.h" switch_step++; - if (!code || am_server || am_receiver) + if (flush_ok_after_signal) { + flush_ok_after_signal = False; + if (code == RERR_SIGNAL) + io_flush(FULL_FLUSH); + } + if (!exit_code && !code) io_flush(FULL_FLUSH); /* FALLTHROUGH */ @@ -174,7 +200,7 @@ NORETURN void _exit_cleanup(int code, const char *file if (cleanup_fname) do_unlink(cleanup_fname); - if (code) + if (exit_code) kill_all(SIGUSR1); if (cleanup_pid && cleanup_pid == getpid()) { char *pidf = lp_pid_file(); @@ -182,34 +208,55 @@ NORETURN void _exit_cleanup(int code, const char *file unlink(lp_pid_file()); } - if (code == 0) { + if (exit_code == 0) { + if (code) + exit_code = code; if (io_error & IOERR_DEL_LIMIT) - code = exit_code = RERR_DEL_LIMIT; + exit_code = RERR_DEL_LIMIT; if (io_error & IOERR_VANISHED) - code = exit_code = RERR_VANISHED; + exit_code = RERR_VANISHED; if (io_error & IOERR_GENERAL || got_xfer_error) - code = exit_code = RERR_PARTIAL; + exit_code = RERR_PARTIAL; } - if (code || am_daemon || (logfile_name && (am_server || !verbose))) - log_exit(code, file, line); + /* If line < 0, this exit is after a MSG_ERROR_EXIT event, so + * we don't want to output a duplicate error. */ + if ((exit_code && line > 0) + || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1)))) + log_exit(exit_code, exit_file, exit_line); /* FALLTHROUGH */ #include "case_N.h" switch_step++; - if (verbose > 2) { + if (DEBUG_GTE(EXIT, 1)) { rprintf(FINFO, "[%s] _exit_cleanup(code=%d, file=%s, line=%d): " "about to call exit(%d)\n", - who_am_i(), unmodified_code, file, line, code); + who_am_i(), first_code, exit_file, exit_line, exit_code); } /* FALLTHROUGH */ #include "case_N.h" switch_step++; - if (am_server && code) + 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 && exit_code) msleep(100); close_all(); @@ -218,12 +265,13 @@ NORETURN void _exit_cleanup(int code, const char *file break; } - exit(code); + exit(exit_code); } void cleanup_disable(void) { cleanup_fname = cleanup_new_fname = NULL; + cleanup_fd_r = cleanup_fd_w = -1; cleanup_got_literal = 0; }