X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e0fde757fda15c0596914e6dc29dcd92a5b6448f..87cc45e136333407acc6463f6415df4979289f30:/cleanup.c diff --git a/cleanup.c b/cleanup.c index 904fbaab..49d18307 100644 --- a/cleanup.c +++ b/cleanup.c @@ -21,6 +21,32 @@ #include "rsync.h" +/** + * 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 * @@ -52,7 +78,7 @@ extern int io_error; pid_t cleanup_child_pid = -1; /** - * Eventually calls exit(), therefore does not return. + * Eventually calls exit(), passing @p code, therefore does not return. * * @param code one of the RERR_* codes from errcode.h. **/ @@ -61,6 +87,13 @@ 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); @@ -108,6 +141,7 @@ void _exit_cleanup(int code, const char *file, int line) rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", ocode, file, line, code); + close_all(); exit(code); }