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
* shutdown() of socket connections. This eliminates the abortive
}
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",
- code, safe_fname(file), line);
+ code, file, 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;
flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
}
- finish_transfer(cleanup_new_fname, fname, cleanup_file, 0,
- !partial_dir);
+ 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 (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
- ocode, safe_fname(file), line, code);
+ ocode, file, line, code);
}
close_all();
void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
int fd_r, int fd_w)
{
- cleanup_fname = fnametmp;
+ cleanup_fname = fname ? fnametmp : NULL;
cleanup_new_fname = fname;
cleanup_file = file;
cleanup_fd_r = fd_r;