- Got rid of the checking of msg_fd_in in read_timeout() -- it was

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 2b207be..b8be0d4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -66,6 +66,7 @@ extern char *shell_cmd;
 extern char *batch_name;
 
 int local_server = 0;
+struct file_list *the_file_list;
 
 /* There's probably never more than at most 2 outstanding child processes,
  * but set it higher, just in case. */
@@ -500,6 +501,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        if (!flist || flist->count == 0) {
                exit_cleanup(0);
        }
+       the_file_list = flist;
 
        io_start_buffering_in();
        io_start_buffering_out();
@@ -676,6 +678,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
                rprintf(FERROR,"server_recv: recv_file_list error\n");
                exit_cleanup(RERR_FILESELECT);
        }
+       the_file_list = flist;
 
        if (argc > 0) {
                if (strcmp(dir,".")) {
@@ -766,11 +769,11 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
                if (write_batch)
                        start_write_batch(f_out);
-               if (!read_batch) /* don't write to pipe */
-                       flist = send_file_list(f_out,argc,argv);
+               flist = send_file_list(f_out, argc, argv);
                set_msg_fd_in(-1);
                if (verbose > 3)
                        rprintf(FINFO,"file list sent\n");
+               the_file_list = flist;
 
                io_flush(NORMAL_FLUSH);
                send_files(flist,f_out,f_in);
@@ -810,6 +813,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                        "the --recursive option?\n");
                exit_cleanup(0);
        }
+       the_file_list = flist;
 
        local_name = get_local_name(flist,argv[0]);
 
@@ -866,8 +870,10 @@ static int start_client(int argc, char *argv[])
                return rc;
 
        if (!read_batch) { /* for read_batch, NO source is specified */
+               argc--;
                shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
                if (shell_path) { /* source is remote */
+                       argv++;
                        if (filesfrom_host && *filesfrom_host
                            && strcmp(filesfrom_host, shell_machine) != 0) {
                                rprintf(FERROR,
@@ -878,22 +884,21 @@ static int start_client(int argc, char *argv[])
                                if (!shell_cmd) {
                                        return start_socket_client(shell_machine,
                                                                   shell_path,
-                                                                  argc-1, argv+1);
+                                                                  argc, argv);
                                }
                                daemon_over_rsh = 1;
                        }
 
+                       am_sender = 0;
+               } else { /* source is local, check dest arg */
+                       am_sender = 1;
+
                        if (argc < 1) { /* destination required */
                                usage(FERROR);
                                exit_cleanup(RERR_SYNTAX);
                        }
 
-                       am_sender = 0;
-                       argv++;
-               } else { /* source is local, check dest arg */
-                       am_sender = 1;
-
-                       shell_path = check_for_hostspec(argv[argc-1], &shell_machine, &rsync_port);
+                       shell_path = check_for_hostspec(argv[argc], &shell_machine, &rsync_port);
                        if (shell_path && filesfrom_host && *filesfrom_host
                            && strcmp(filesfrom_host, shell_machine) != 0) {
                                rprintf(FERROR,
@@ -908,22 +913,16 @@ static int start_client(int argc, char *argv[])
                                        exit_cleanup(RERR_SYNTAX);
                                }
                                shell_machine = NULL;
-                               shell_path = argv[argc-1];
+                               shell_path = argv[argc];
                        } else if (rsync_port) {
                                if (!shell_cmd) {
                                        return start_socket_client(shell_machine,
                                                                   shell_path,
-                                                                  argc-1, argv);
+                                                                  argc, argv);
                                }
                                daemon_over_rsh = 1;
                        }
-
-                       if (argc < 2) {
-                               usage(FERROR);
-                               exit_cleanup(RERR_SYNTAX);
-                       }
                }
-               argc--;
        } else {  /* read_batch */
                local_server = 1;
                shell_path = argv[argc-1];