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
Added the --executability (-E) option.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
ca7e354
..
b1bf256
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-121,8
+121,8
@@
void _exit_cleanup(int code, const char *file, int line)
flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
}
flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
}
- finish_transfer(cleanup_new_fname, fname,
cleanup_file, 0
,
- !partial_dir);
+ finish_transfer(cleanup_new_fname, fname,
NULL
,
+
cleanup_file, 0,
!partial_dir);
}
io_flush(FULL_FLUSH);
if (cleanup_fname)
}
io_flush(FULL_FLUSH);
if (cleanup_fname)
@@
-136,10
+136,12
@@
void _exit_cleanup(int code, const char *file, int line)
}
if (code == 0) {
}
if (code == 0) {
- if (
(io_error & ~IOERR_VANISHED) || log_got_error
)
- code = RERR_
PARTIAL
;
-
else if (io_error
)
+ if (
io_error & IOERR_DEL_LIMIT
)
+ code = RERR_
DEL_LIMIT
;
+
if (io_error & IOERR_VANISHED
)
code = RERR_VANISHED;
code = RERR_VANISHED;
+ if (io_error & IOERR_GENERAL || log_got_error)
+ code = RERR_PARTIAL;
}
if (code)
}
if (code)
@@
-164,7
+166,7
@@
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
tmp
;
+ cleanup_fname = fname
? fnametmp : NULL
;
cleanup_new_fname = fname;
cleanup_file = file;
cleanup_fd_r = fd_r;
cleanup_new_fname = fname;
cleanup_file = file;
cleanup_fd_r = fd_r;