extern int verbose;
+
+/****************************************************************************
+wait for a process to exit, calling io_flush while waiting
+****************************************************************************/
+void wait_process(pid_t pid, int *status)
+{
+ while (waitpid(pid, status, WNOHANG) == 0) {
+ msleep(20);
+ io_flush();
+ }
+ *status = WEXITSTATUS(*status);
+}
+
static void report(int f)
{
time_t t = time(NULL);
char *tok,*dir=NULL;
extern int local_server;
extern char *rsync_path;
+ extern int blocking_io;
if (!local_server) {
if (!cmd)
args[argc++] = rsync_path;
server_options(args,&argc);
+
+
+ if (strcmp(cmd, RSYNC_RSH) == 0) blocking_io = 1;
}
args[argc++] = ".";
char *dir = argv[0];
extern int relative_paths;
extern int recurse;
+ extern int remote_version;
if (verbose > 2)
rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
}
send_files(flist,f_out,f_in);
+ io_flush();
report(f_out);
+ if (remote_version >= 24) {
+ /* final goodbye message */
+ read_int(f_in);
+ }
io_flush();
exit_cleanup(0);
}
set_error_fd(error_pipe[1]);
recv_files(f_in,flist,local_name,recv_pipe[1]);
+ io_flush();
report(f_in);
write_int(recv_pipe[1],1);
close(recv_pipe[1]);
io_flush();
- /* finally we go to sleep until our parent kills us with
- a USR2 signal */
- while (1) sleep(60);
+ /* finally we go to sleep until our parent kills us
+ with a USR2 signal. We sleep for a short time as on
+ some OSes a signal won't interrupt a sleep! */
+ while (1) msleep(20);
}
close(recv_pipe[1]);
close(error_pipe[1]);
- io_close_input(f_in);
if (f_in != f_out) close(f_in);
io_start_buffering(f_out);
setup_protocol(f_out, f_in);
+ set_nonblocking(f_in);
+ set_nonblocking(f_out);
+
if (remote_version >= 23)
io_start_multiplex_out(f_out);
int status = 0, status2 = 0;
char *local_name = NULL;
extern int am_sender;
- extern int list_only;
extern int remote_version;
+ set_nonblocking(f_in);
+ set_nonblocking(f_out);
+
setup_protocol(f_out,f_in);
if (remote_version >= 23)
io_flush();
wait_process(pid, &status);
}
- report(-1);
if (remote_version >= 24) {
/* final goodbye message */
read_int(f_in);
}
+ report(-1);
exit_cleanup(status);
}
- if (argc == 0) list_only = 1;
+ if (argc == 0) {
+ extern int list_only;
+ list_only = 1;
+ }
send_exclude_list(f_out);
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
+
+ if (argc == 0 && !am_sender) {
+ extern int list_only;
+ list_only = 1;
+ }
pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
#endif
if (am_server) {
+ set_nonblocking(STDIN_FILENO);
+ set_nonblocking(STDOUT_FILENO);
start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
}