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 *.bz2 and *.tbz to default dont compress list
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
0c4f2cd
..
6a4d103
100644
(file)
--- 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;
char *tok,*dir=NULL;
extern int local_server;
extern char *rsync_path;
+ extern int blocking_io;
if (!local_server) {
if (!cmd)
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);
args[argc++] = rsync_path;
server_options(args,&argc);
+
+
+ if (strcmp(cmd, RSYNC_RSH) == 0) blocking_io = 1;
}
args[argc++] = ".";
}
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();
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]);
}
close(recv_pipe[1]);
@@
-417,6
+422,9
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
setup_protocol(f_out, f_in);
setup_protocol(f_out, f_in);
+ set_nonblocking(f_in);
+ set_nonblocking(f_out);
+
if (remote_version >= 23)
io_start_multiplex_out(f_out);
if (remote_version >= 23)
io_start_multiplex_out(f_out);
@@
-440,6
+448,9
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
extern int list_only;
extern int remote_version;
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)
setup_protocol(f_out,f_in);
if (remote_version >= 23)
@@
-695,6
+706,8
@@
int main(int argc,char *argv[])
#endif
if (am_server) {
#endif
if (am_server) {
+ set_nonblocking(STDIN_FILENO);
+ set_nonblocking(STDOUT_FILENO);
start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
}
start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
}