X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6e86c951d72ab394acebd4ca835c751dd2f22d7c..e7c67065c060d500eba8d073da9568db2c658aad:/cleanup.c diff --git a/cleanup.c b/cleanup.c index 3919c7cd..8eb649e1 100644 --- a/cleanup.c +++ b/cleanup.c @@ -1,29 +1,36 @@ -/* -*- 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* + * End-of-run cleanup routines. + * + * Copyright (C) 1996-2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2002 Martin Pool + * Copyright (C) 2003, 2004, 2005, 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" extern int io_error; extern int keep_partial; extern int log_got_error; +extern char *partial_dir; + +#ifdef HAVE_SIGACTION +static struct sigaction sigact; +#endif /** * Close all open sockets and files, allowing a (somewhat) graceful @@ -36,15 +43,13 @@ void close_all(void) int max_fd; int fd; int ret; - struct stat st; + 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)) { + if ((ret = do_fstat(fd, &st)) == 0) { + if (is_a_socket(fd)) ret = shutdown(fd, 2); - } ret = close(fd); } } @@ -69,13 +74,12 @@ void close_all(void) * --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; +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_fd_r, cleanup_fd_w; static pid_t cleanup_pid = 0; pid_t cleanup_child_pid = -1; @@ -96,8 +100,8 @@ void _exit_cleanup(int code, const char *file, int line) } inside_cleanup++; - signal(SIGUSR1, SIG_IGN); - signal(SIGUSR2, SIG_IGN); + SIGACTION(SIGUSR1, SIG_IGN); + SIGACTION(SIGUSR2, SIG_IGN); if (verbose > 3) { rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", @@ -106,41 +110,49 @@ void _exit_cleanup(int code, const char *file, int line) if (cleanup_child_pid != -1) { int status; - if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) { + if (wait_process(cleanup_child_pid, &status, WNOHANG) + == cleanup_child_pid) { status = WEXITSTATUS(status); - if (status > code) code = status; + if (status > code) + code = status; } } - if (cleanup_got_literal && cleanup_fname && keep_partial) { + if (cleanup_got_literal && cleanup_fname && keep_partial + && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) { 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, 0); + if (cleanup_fd_r != -1) + close(cleanup_fd_r); + if (cleanup_fd_w != -1) { + flush_write_file(cleanup_fd_w); + close(cleanup_fd_w); + } + finish_transfer(cleanup_new_fname, fname, NULL, + cleanup_file, 0, !partial_dir); } io_flush(FULL_FLUSH); if (cleanup_fname) do_unlink(cleanup_fname); - if (code) { + if (code) kill_all(SIGUSR1); - } if (cleanup_pid && cleanup_pid == getpid()) { char *pidf = lp_pid_file(); - if (pidf && *pidf) { + if (pidf && *pidf) unlink(lp_pid_file()); - } } if (code == 0) { - if ((io_error & ~IOERR_VANISHED) || log_got_error) - code = RERR_PARTIAL; - else if (io_error) + if (io_error & IOERR_DEL_LIMIT) + code = RERR_DEL_LIMIT; + if (io_error & IOERR_VANISHED) code = RERR_VANISHED; + if (io_error & IOERR_GENERAL || log_got_error) + code = RERR_PARTIAL; } - if (code) log_exit(code, file, line); + 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", @@ -159,14 +171,13 @@ void cleanup_disable(void) void cleanup_set(char *fnametmp, char *fname, struct file_struct *file, - struct map_struct *buf, int fd1, int fd2) + int fd_r, int fd_w) { - cleanup_fname = fnametmp; + cleanup_fname = fname ? fnametmp : NULL; cleanup_new_fname = fname; cleanup_file = file; - cleanup_buf = buf; - cleanup_fd1 = fd1; - cleanup_fd2 = fd2; + cleanup_fd_r = fd_r; + cleanup_fd_w = fd_w; } void cleanup_set_pid(pid_t pid)