Got rid of calls to (the soon to vanish) safe_fname() function.

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 2ac13ee..bb589e4 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -24,6 +24,7 @@
 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
@@ -36,12 +37,11 @@ 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 ((ret = do_fstat(fd, &st)) == 0) {
                        if (is_a_socket(fd))
                                ret = shutdown(fd, 2);
                        ret = close(fd);
@@ -73,8 +73,7 @@ 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;
@@ -112,16 +111,18 @@ void _exit_cleanup(int code, const char *file, int line)
                }
        }
 
-       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)
@@ -135,10 +136,12 @@ void _exit_cleanup(int code, const char *file, int line)
        }
 
        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)
@@ -161,14 +164,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)