extern int io_error;
extern int keep_partial;
extern int log_got_error;
+extern char *partial_dir;
/**
* 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);
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;
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- code, file, line);
+ code, safe_fname(file), line);
}
if (cleanup_child_pid != -1) {
}
}
- 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, cleanup_file, 0,
+ !partial_dir);
}
io_flush(FULL_FLUSH);
if (cleanup_fname)
if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
- ocode, file, line, code);
+ ocode, safe_fname(file), line, code);
}
close_all();
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_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)