Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12fa790
)
Call finish_transfer() with a valid partialptr string, when
author
Wayne Davison
<wayned@samba.org>
Mon, 30 Jan 2006 07:18:10 +0000
(07:18 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 30 Jan 2006 07:18:10 +0000
(07:18 +0000)
appropriate.
receiver.c
patch
|
blob
|
blame
|
history
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) {
}
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)) {
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;
if (delay_updates && recv_ok) {
set_delayed_bit(i);
recv_ok = -1;