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
We should be using wait_process(), not waitpid() directly.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
bb589e4
..
0163dd2
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-104,7
+104,8
@@
void _exit_cleanup(int code, const char *file, int line)
if (cleanup_child_pid != -1) {
int status;
if (cleanup_child_pid != -1) {
int status;
- if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) {
+ if (wait_process(cleanup_child_pid, &status, WNOHANG)
+ == cleanup_child_pid) {
status = WEXITSTATUS(status);
if (status > code)
code = status;
status = WEXITSTATUS(status);
if (status > code)
code = status;
@@
-121,8
+122,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)