-/* -*- 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 am_server;
+extern int am_daemon;
extern int io_error;
extern int keep_partial;
extern int log_got_error;
+extern char *partial_dir;
+extern char *logfile_name;
+
+#ifdef HAVE_SIGACTION
+static struct sigaction sigact;
+#endif
/**
* Close all open sockets and files, allowing a (somewhat) graceful
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 ((ret = do_fstat(fd, &st)) == 0) {
if (is_a_socket(fd))
ret = shutdown(fd, 2);
ret = close(fd);
}
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",
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 (cleanup_got_literal && cleanup_fname && keep_partial) {
+ if (cleanup_got_literal && cleanup_new_fname && keep_partial
+ && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
char *fname = cleanup_fname;
cleanup_fname = NULL;
if (cleanup_fd_r != -1)
close(cleanup_fd_r);
- if (cleanup_fd_w != -1)
+ if (cleanup_fd_w != -1) {
+ flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
- finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
+ }
+ finish_transfer(cleanup_new_fname, fname, NULL,
+ cleanup_file, 0, !partial_dir);
}
io_flush(FULL_FLUSH);
if (cleanup_fname)
}
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)
+ if (code || am_daemon || (logfile_name && (am_server || !verbose)))
log_exit(code, file, line);
if (verbose > 2) {
void cleanup_disable(void)
{
- cleanup_fname = NULL;
+ cleanup_fname = cleanup_new_fname = NULL;
cleanup_got_literal = 0;
}
int fd_r, int fd_w)
{
cleanup_fname = fnametmp;
- cleanup_new_fname = fname;
+ cleanup_new_fname = fname; /* can be NULL on a partial-dir failure */
cleanup_file = file;
cleanup_fd_r = fd_r;
cleanup_fd_w = fd_w;