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 insure debug support
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
a546778
..
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++] = ".";
@@
-283,6
+287,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
extern int delete_after;
extern int recurse;
extern int delete_mode;
extern int delete_after;
extern int recurse;
extern int delete_mode;
+ extern int remote_version;
if (preserve_hard_links)
init_hard_links(flist);
if (preserve_hard_links)
init_hard_links(flist);
@@
-294,12
+299,12
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
}
}
}
}
- if (
pipe
(recv_pipe) < 0) {
+ if (
fd_pair
(recv_pipe) < 0) {
rprintf(FERROR,"pipe failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);
}
rprintf(FERROR,"pipe failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);
}
- if (
pipe
(error_pipe) < 0) {
+ if (
fd_pair
(error_pipe) < 0) {
rprintf(FERROR,"error pipe failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);
}
rprintf(FERROR,"error pipe failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);
}
@@
-320,8
+325,13
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
recv_files(f_in,flist,local_name,recv_pipe[1]);
report(f_in);
recv_files(f_in,flist,local_name,recv_pipe[1]);
report(f_in);
+ write_int(recv_pipe[1],1);
+ close(recv_pipe[1]);
io_flush();
io_flush();
- _exit(0);
+ /* 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]);
@@
-335,7
+345,15
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
generate_files(f_out,flist,local_name,recv_pipe[0]);
generate_files(f_out,flist,local_name,recv_pipe[0]);
+ read_int(recv_pipe[0]);
+ close(recv_pipe[0]);
+ if (remote_version >= 24) {
+ /* send a final goodbye message */
+ write_int(f_out, -1);
+ }
io_flush();
io_flush();
+
+ kill(pid, SIGUSR2);
wait_process(pid, &status);
return status;
}
wait_process(pid, &status);
return status;
}
@@
-350,9
+368,18
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
extern int delete_mode;
extern int delete_excluded;
extern int am_daemon;
extern int delete_mode;
extern int delete_excluded;
extern int am_daemon;
+ extern int module_id;
+ extern int am_sender;
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
+
+ if (am_daemon && lp_read_only(module_id) && !am_sender) {
+ rprintf(FERROR,"ERROR: module is read only\n");
+ exit_cleanup(RERR_SYNTAX);
+ return;
+ }
+
if (argc > 0) {
dir = argv[0];
if (argc > 0) {
dir = argv[0];
@@
-391,9
+418,16
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
{
extern int cvs_exclude;
extern int am_sender;
{
extern int cvs_exclude;
extern int am_sender;
+ extern int remote_version;
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 (am_sender) {
recv_exclude_list(f_in);
if (cvs_exclude)
if (am_sender) {
recv_exclude_list(f_in);
if (cvs_exclude)
@@
-412,8
+446,15
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
char *local_name = NULL;
extern int am_sender;
extern int list_only;
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);
setup_protocol(f_out,f_in);
+
+ if (remote_version >= 23)
+ io_start_multiplex_in(f_in);
if (am_sender) {
extern int cvs_exclude;
if (am_sender) {
extern int cvs_exclude;
@@
-435,6
+476,10
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
wait_process(pid, &status);
}
report(-1);
wait_process(pid, &status);
}
report(-1);
+ if (remote_version >= 24) {
+ /* final goodbye message */
+ read_int(f_in);
+ }
exit_cleanup(status);
}
exit_cleanup(status);
}
@@
-592,6
+637,10
@@
static RETSIGTYPE sigusr1_handler(int val) {
exit_cleanup(RERR_SIGNAL);
}
exit_cleanup(RERR_SIGNAL);
}
+static RETSIGTYPE sigusr2_handler(int val) {
+ _exit(0);
+}
+
int main(int argc,char *argv[])
{
extern int am_root;
int main(int argc,char *argv[])
{
extern int am_root;
@@
-601,6
+650,7
@@
int main(int argc,char *argv[])
extern int am_server;
signal(SIGUSR1, sigusr1_handler);
extern int am_server;
signal(SIGUSR1, sigusr1_handler);
+ signal(SIGUSR2, sigusr2_handler);
starttime = time(NULL);
am_root = (getuid() == 0);
starttime = time(NULL);
am_root = (getuid() == 0);
@@
-656,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);
}