Call finish_transfer() with its new arg.

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 0316bf9..dc8969f 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
@@ -111,14 +112,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_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, cleanup_file, 0,
+                               !partial_dir);
        }
        io_flush(FULL_FLUSH);
        if (cleanup_fname)