Call finish_transfer() with its newly-added arg.

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index ca7e354..b1bf256 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -121,8 +121,8 @@ void _exit_cleanup(int code, const char *file, int line)
                        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)
@@ -136,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)
@@ -164,7 +166,7 @@ void cleanup_disable(void)
 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;