Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed mkrounding.c to rounding.c.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
046ad95
..
35cbb57
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-841,7
+841,7
@@
static int copy_altdest_file(const char *src, const char *dest, struct file_stru
{
char buf[MAXPATHLEN];
const char *copy_to, *partialptr;
{
char buf[MAXPATHLEN];
const char *copy_to, *partialptr;
- int fd_w;
+ int
ok,
fd_w;
if (inplace) {
/* Let copy_file open the destination in place. */
if (inplace) {
/* Let copy_file open the destination in place. */
@@
-865,11
+865,9
@@
static int copy_altdest_file(const char *src, const char *dest, struct file_stru
return -1;
}
partialptr = partial_dir ? partial_dir_fname(dest) : NULL;
return -1;
}
partialptr = partial_dir ? partial_dir_fname(dest) : NULL;
- if (partialptr && *partialptr == '/')
- partialptr = NULL;
- finish_transfer(dest, copy_to, src, partialptr, file, 1, 0);
+ ok = finish_transfer(dest, copy_to, src, partialptr, file, 1, 0);
cleanup_disable();
cleanup_disable();
- return
0
;
+ return
ok ? 0 : -1
;
}
/* This is only called for regular files. We return -2 if we've finished
}
/* This is only called for regular files. We return -2 if we've finished