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
updated config scripts from subversion
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
63fab0d
..
4ecf46d
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-504,16
+504,16
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
rprintf(FINFO,"file list sent\n");
send_files(flist,f_out,f_in);
rprintf(FINFO,"file list sent\n");
send_files(flist,f_out,f_in);
+ if (remote_version >= 24) {
+ /* final goodbye message */
+ read_int(f_in);
+ }
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n",pid);
io_flush();
wait_process(pid, &status);
}
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n",pid);
io_flush();
wait_process(pid, &status);
}
- if (remote_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
report(-1);
exit_cleanup(status);
}
report(-1);
exit_cleanup(status);
}
@@
-700,6
+700,9
@@
static RETSIGTYPE sigusr2_handler(int val) {
}
static RETSIGTYPE sigchld_handler(int val) {
}
static RETSIGTYPE sigchld_handler(int val) {
+#ifdef WNOHANG
+ while (waitpid(-1, NULL, WNOHANG) > 0) ;
+#endif
}
int main(int argc,char *argv[])
}
int main(int argc,char *argv[])