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
The [ & ] are now removed from a literal IPv6 hostname passed to the
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
d638868
..
9cf7be0
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-121,7
+121,7
@@
void _exit_cleanup(int code, const char *file, int line)
}
}
}
}
- if (cleanup_got_literal && cleanup_fname && keep_partial
+ if (cleanup_got_literal && cleanup_
new_
fname && keep_partial
&& handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
char *fname = cleanup_fname;
cleanup_fname = NULL;
&& handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
char *fname = cleanup_fname;
cleanup_fname = NULL;
@@
-168,7
+168,7
@@
void _exit_cleanup(int code, const char *file, int line)
void cleanup_disable(void)
{
void cleanup_disable(void)
{
- cleanup_fname = NULL;
+ cleanup_fname =
cleanup_new_fname =
NULL;
cleanup_got_literal = 0;
}
cleanup_got_literal = 0;
}
@@
-176,8
+176,8
@@
void cleanup_disable(void)
void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
int fd_r, int fd_w)
{
void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
int fd_r, int fd_w)
{
- cleanup_fname = fname
? fnametmp : NULL
;
- cleanup_new_fname = fname;
+ cleanup_fname = fname
tmp
;
+ cleanup_new_fname = fname;
/* can be NULL on a partial-dir failure */
cleanup_file = file;
cleanup_fd_r = fd_r;
cleanup_fd_w = fd_w;
cleanup_file = file;
cleanup_fd_r = fd_r;
cleanup_fd_w = fd_w;