Call finish_transfer() with a valid partialptr string, when

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index db4f7f8..30cdc36 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -344,7 +344,7 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name)
 
        for (i = -1; (i = next_delayed_bit(i)) >= 0; ) {
                struct file_struct *file = flist->files[i];
-               fname = local_name ? local_name : f_name(file);
+               fname = local_name ? local_name : f_name(file, NULL);
                if ((partialptr = partial_dir_fname(fname)) != NULL) {
                        if (make_backups && !make_backup(fname))
                                continue;
@@ -378,7 +378,7 @@ static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i)
                        rprintf(FINFO,
                                "(No batched update for%s \"%s\")\n",
                                phase ? " resend of" : "",
-                               f_name(the_file_list->files[next_gen_i]));
+                               f_name(the_file_list->files[next_gen_i], NULL));
                }
                next_gen_i = read_int(batch_gen_fd);
                if (next_gen_i == -1)
@@ -456,7 +456,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
                        continue;
 
                file = flist->files[i];
-               fname = local_name ? local_name : f_name_to(file, fbuf);
+               fname = local_name ? local_name : f_name(file, fbuf);
 
                if (verbose > 2)
                        rprintf(FINFO, "recv_files(%s)\n", fname);
@@ -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;