X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2f03f956f425f03335005ba743f19b6ed3454248..4762db4fc90e0bd0c04c9ba7c50123d378427fd0:/cleanup.c diff --git a/cleanup.c b/cleanup.c index 05f34527..49d18307 100644 --- a/cleanup.c +++ b/cleanup.c @@ -1,6 +1,8 @@ -/* - Copyright (C) Andrew Tridgell 1996 +/* -*- c-file-style: "linux" -*- + + Copyright (C) 1996-2000 by Andrew Tridgell Copyright (C) Paul Mackerras 1996 + Copyright (C) 2002 by Martin Pool 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 @@ -19,24 +21,101 @@ #include "rsync.h" -/* handling the cleanup when a transfer is interrupted is tricky when - --partial is selected. We need to ensure that the partial file is - kept if any real data has been transferred */ +/** + * Close all open sockets and files, allowing a (somewhat) graceful + * shutdown() of socket connections. This eliminates the abortive + * TCP RST sent by a Winsock-based system when the close() occurs. + **/ +void close_all(void) +{ +#ifdef SHUTDOWN_ALL_SOCKETS + int max_fd; + int fd; + int ret; + struct stat st; + + max_fd = sysconf(_SC_OPEN_MAX) - 1; + for (fd = max_fd; fd >= 0; fd--) { + ret = fstat(fd,&st); + if (fstat(fd,&st) == 0) { + if (is_a_socket(fd)) { + ret = shutdown(fd, 2); + } + ret = close(fd); + } + } +#endif +} + +/** + * @file cleanup.c + * + * Code for handling interrupted transfers. Depending on the @c + * --partial option, we may either delete the temporary file, or go + * ahead and overwrite the destination. This second behaviour only + * occurs if we've sent literal data and therefore hopefully made + * progress on the transfer. + **/ + +/** + * Set to True once literal data has been sent across the link for the + * current file. (????) + * + * Handling the cleanup when a transfer is interrupted is tricky when + * --partial is selected. We need to ensure that the partial file is + * kept if any real data has been transferred. + **/ int cleanup_got_literal=0; static char *cleanup_fname; static char *cleanup_new_fname; static struct file_struct *cleanup_file; +static int cleanup_fd1, cleanup_fd2; +static struct map_struct *cleanup_buf; +static int cleanup_pid = 0; +extern int io_error; + +pid_t cleanup_child_pid = -1; -void exit_cleanup(int code) +/** + * Eventually calls exit(), passing @p code, therefore does not return. + * + * @param code one of the RERR_* codes from errcode.h. + **/ +void _exit_cleanup(int code, const char *file, int line) { + int ocode = code; extern int keep_partial; + extern int log_got_error; + static int inside_cleanup = 0; + + if (inside_cleanup > 10) { + /* prevent the occasional infinite recursion */ + return; + } + inside_cleanup++; signal(SIGUSR1, SIG_IGN); + signal(SIGUSR2, SIG_IGN); + + if (verbose > 3) + rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", + code, file, line); + + if (cleanup_child_pid != -1) { + int status; + if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) { + status = WEXITSTATUS(status); + if (status > code) code = status; + } + } if (cleanup_got_literal && cleanup_fname && keep_partial) { char *fname = cleanup_fname; cleanup_fname = NULL; + if (cleanup_buf) unmap_file(cleanup_buf); + if (cleanup_fd1 != -1) close(cleanup_fd1); + if (cleanup_fd2 != -1) close(cleanup_fd2); finish_transfer(cleanup_new_fname, fname, cleanup_file); } io_flush(); @@ -45,6 +124,24 @@ void exit_cleanup(int code) if (code) { kill_all(SIGUSR1); } + if ((cleanup_pid != 0) && (cleanup_pid == (int) getpid())) { + char *pidf = lp_pid_file(); + if (pidf && *pidf) { + unlink(lp_pid_file()); + } + } + + if (code == 0 && (io_error || log_got_error)) { + code = RERR_PARTIAL; + } + + if (code) log_exit(code, file, line); + + if (verbose > 2) + rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", + ocode, file, line, code); + + close_all(); exit(code); } @@ -55,9 +152,18 @@ void cleanup_disable(void) } -void cleanup_set(char *fnametmp, char *fname, struct file_struct *file) +void cleanup_set(char *fnametmp, char *fname, struct file_struct *file, + struct map_struct *buf, int fd1, int fd2) { cleanup_fname = fnametmp; cleanup_new_fname = fname; cleanup_file = file; + cleanup_buf = buf; + cleanup_fd1 = fd1; + cleanup_fd2 = fd2; +} + +void cleanup_set_pid(int pid) +{ + cleanup_pid = pid; }