X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f0359dd00d60d72c4b3dec85de8e490692f6015c..69c6522734897c0b81b184c5ebcc6cd9461f6da3:/main.c diff --git a/main.c b/main.c index f7e52bed..6a4d1031 100644 --- a/main.c +++ b/main.c @@ -112,6 +112,7 @@ static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f char *tok,*dir=NULL; extern int local_server; extern char *rsync_path; + extern int blocking_io; if (!local_server) { if (!cmd) @@ -144,6 +145,9 @@ static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f args[argc++] = rsync_path; server_options(args,&argc); + + + if (strcmp(cmd, RSYNC_RSH) == 0) blocking_io = 1; } args[argc++] = "."; @@ -324,9 +328,10 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) 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 sleepp for a short time as on + some OSes a signal won't interrupt a sleep! */ + while (1) sleep(1); } close(recv_pipe[1]);