got rid of some unused variables

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 0c4f2cd..7d04adf 100644 (file)
--- a/main.c
+++ b/main.c
@@ -25,6 +25,19 @@ struct stats stats;
 
 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);
@@ -112,6 +125,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 +158,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++] = ".";
@@ -236,6 +253,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        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());
@@ -267,7 +285,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        }
 
        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);
 }
@@ -319,19 +342,20 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
                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 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(error_pipe[1]);
-       io_close_input(f_in);
        if (f_in != f_out) close(f_in);
 
        io_start_buffering(f_out);
@@ -417,6 +441,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 
        setup_protocol(f_out, f_in);
 
+       set_nonblocking(f_in);
+       set_nonblocking(f_out);
+
        if (remote_version >= 23)
                io_start_multiplex_out(f_out);
 
@@ -440,6 +467,9 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
        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)
@@ -464,11 +494,11 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
                        io_flush();
                        wait_process(pid, &status);
                }
-               report(-1);
                if (remote_version >= 24) {
                        /* final goodbye message */             
                        read_int(f_in);
                }
+               report(-1);
                exit_cleanup(status);
        }
 
@@ -695,6 +725,8 @@ int main(int argc,char *argv[])
 #endif
 
        if (am_server) {
+               set_nonblocking(STDIN_FILENO);
+               set_nonblocking(STDOUT_FILENO);
                start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
        }