From 4a4d2b1ba0871c185acb4d7b8db793ea9474e7e7 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 30 Jan 2006 07:18:10 +0000 Subject: [PATCH] Call finish_transfer() with a valid partialptr string, when appropriate. --- receiver.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/receiver.c b/receiver.c index 37c5074b..30cdc36c 100644 --- 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; -- 2.34.1