X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d365e229678eb7ae758a415d100043f6e07dea35..aac5cab80b9d4fc0adff2b72aeba2406176930ae:/main.c diff --git a/main.c b/main.c index e2d6aa7f..9a1bec0f 100644 --- a/main.c +++ b/main.c @@ -630,7 +630,6 @@ static void read_final_goodbye(int f_in, int f_out) } } - static void do_server_sender(int f_in, int f_out, int argc, char *argv[]) { struct file_list *flist; @@ -671,9 +670,8 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[]) } flist = send_file_list(f_out,argc,argv); - if (!flist || flist->count == 0) { + if (!flist || flist->count == 0) exit_cleanup(0); - } the_file_list = flist; io_start_buffering_in(); @@ -701,7 +699,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links) - init_hard_links(); + match_hard_links(); #endif if (fd_pair(error_pipe) < 0) { @@ -784,7 +782,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) return exit_code; } - static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) { int exit_code; @@ -905,12 +902,10 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) keep_dirlinks = 0; /* Must be disabled on the sender. */ if (need_messages_from_generator) io_start_multiplex_in(); - recv_filter_list(f_in); do_server_sender(f_in, f_out, argc, argv); - } else { + } else do_server_recv(f_in, f_out, argc, argv); - } exit_cleanup(0); } @@ -1023,7 +1018,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) return MAX(exit_code, exit_code2); } -static int copy_argv (char *argv[]) +static int copy_argv(char *argv[]) { int i;