Call finish_transfer() with a valid partialptr string, when

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 37c5074..30cdc36 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -681,15 +681,18 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
                }
 
                if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
-                       finish_transfer(fname, fnametmp, file, recv_ok, 1);
-                       if (partialptr != fname && fnamecmp == partialptr) {
+                       if (partialptr == fname || *partial_dir == '/')
+                               partialptr = NULL;
+                       finish_transfer(fname, fnametmp, partialptr,
+                                       file, recv_ok, 1);
+                       if (fnamecmp == partialptr) {
                                do_unlink(partialptr);
                                handle_partial_dir(partialptr, PDIR_DELETE);
                        }
                } else if (keep_partial && partialptr
                    && handle_partial_dir(partialptr, PDIR_CREATE)) {
-                       finish_transfer(partialptr, fnametmp, file, recv_ok,
-                                       !partial_dir);
+                       finish_transfer(partialptr, fnametmp, NULL,
+                                       file, recv_ok, !partial_dir);
                        if (delay_updates && recv_ok) {
                                set_delayed_bit(i);
                                recv_ok = -1;