X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7a392c77cb322925a4663562c94c7dc5f74f674..9eeb3b9c88d62bac0fed650fdbc310d5958cc541:/main.c diff --git a/main.c b/main.c index f71d46c3..0c355362 100644 --- a/main.c +++ b/main.c @@ -49,15 +49,18 @@ extern int protocol_version; extern int recurse; extern int relative_paths; extern int rsync_port; +extern int whole_file; extern int read_batch; extern int write_batch; +extern int batch_fd; +extern int batch_gen_fd; extern int filesfrom_fd; extern pid_t cleanup_child_pid; extern char *files_from; extern char *remote_filesfrom_file; extern char *rsync_path; extern char *shell_cmd; -extern struct file_list *batch_flist; +extern char *batch_name; /* there's probably never more than at most 2 outstanding child processes, @@ -106,8 +109,19 @@ void wait_process(pid_t pid, int *status) *status = WEXITSTATUS(*status); } +/* This function gets called from all 3 processes. We want the client side + * to actually output the text, but the sender is the only process that has + * all the stats we need. So, if we're a client sender, we do the report. + * If we're a server sender, we write the stats on the supplied fd. If + * we're the client receiver we read the stats from the supplied fd and do + * the report. All processes might also generate a set of debug stats, if + * the verbose level is high enough (this is the only thing that the + * generator process and the server receiver ever do here). */ static void report(int f) { + /* Cache two stats because the read/write code can change it. */ + int64 total_read = stats.total_read; + int64 total_written = stats.total_written; time_t t = time(NULL); if (do_stats && verbose > 1) { @@ -127,13 +141,9 @@ static void report(int f) if (am_server) { if (am_sender) { - int64 w; - /* store total_written in a temporary - * because write_longint changes it */ - w = stats.total_written; - write_longint(f,stats.total_read); - write_longint(f,w); - write_longint(f,stats.total_size); + write_longint(f, total_read); + write_longint(f, total_written); + write_longint(f, stats.total_size); } return; } @@ -141,12 +151,17 @@ static void report(int f) /* this is the client */ if (!am_sender) { - int64 r; - stats.total_written = read_longint(f); - /* store total_read in a temporary, read_longint changes it */ - r = read_longint(f); + /* Read the first two in opposite order because the meaning of + * read/write swaps when switching from sender to receiver. */ + total_written = read_longint(f); + total_read = read_longint(f); stats.total_size = read_longint(f); - stats.total_read = r; + } else if (write_batch) { + /* The --read-batch process is going to be a client + * receiver, so we need to give it the stats. */ + write_longint(batch_fd, total_read); + write_longint(batch_fd, total_written); + write_longint(batch_fd, stats.total_size); } if (do_stats) { @@ -163,19 +178,19 @@ static void report(int f) (double)stats.matched_data); rprintf(FINFO,"File list size: %d\n", stats.flist_size); rprintf(FINFO,"Total bytes written: %.0f\n", - (double)stats.total_written); + (double)total_written); rprintf(FINFO,"Total bytes read: %.0f\n", - (double)stats.total_read); + (double)total_read); } if (verbose || do_stats) { - rprintf(FINFO,"\nwrote %.0f bytes read %.0f bytes %.2f bytes/sec\n", - (double)stats.total_written, - (double)stats.total_read, - (stats.total_written+stats.total_read)/(0.5 + (t-starttime))); - rprintf(FINFO,"total size is %.0f speedup is %.2f\n", + rprintf(FINFO, + "\nwrote %.0f bytes read %.0f bytes %.2f bytes/sec\n", + (double)total_written, (double)total_read, + (total_written + total_read)/(0.5 + (t - starttime))); + rprintf(FINFO, "total size is %.0f speedup is %.2f\n", (double)stats.total_size, - (1.0*stats.total_size)/(stats.total_written+stats.total_read)); + (double)stats.total_size / (total_written+total_read)); } fflush(stdout); @@ -299,13 +314,24 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, rprintf(FINFO,"\n"); } - if (local_server) { - if (read_batch) - create_flist_from_batch(); /* sets batch_flist */ + if (read_batch) { + int from_gen_pipe[2]; + if (fd_pair(from_gen_pipe) < 0) { + rsyserr(FERROR, errno, "pipe"); + exit_cleanup(RERR_IPC); + } + batch_gen_fd = from_gen_pipe[0]; + *f_out = from_gen_pipe[1]; + *f_in = batch_fd; + ret = -1; /* no child pid */ + } else if (local_server) { + /* If the user didn't request --[no-]whole-file, force + * it on, but only if we're not batch processing. */ + if (whole_file < 0 && !write_batch) + whole_file = 1; ret = local_child(argc, args, f_in, f_out, child_main); - } else { + } else ret = piped_child(args,f_in,f_out); - } if (dir) free(dir); @@ -378,7 +404,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) (long)getpid()); } - if (am_daemon && lp_write_only(module_id) && am_sender) { + if (am_daemon && lp_write_only(module_id)) { rprintf(FERROR, "ERROR: module is write only\n"); exit_cleanup(RERR_SYNTAX); return; @@ -401,7 +427,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) } if (argc == 0 && recurse) { - argc=1; + argc = 1; argv--; argv[0] = "."; } @@ -411,8 +437,9 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) exit_cleanup(0); } - io_start_buffering_in(f_in); - io_start_buffering_out(f_out); + io_start_buffering_in(); + io_start_buffering_out(); + send_files(flist,f_out,f_in); io_flush(FULL_FLUSH); report(f_out); @@ -428,7 +455,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) { int pid; - int status=0; + int status = 0; int error_pipe[2]; if (preserve_hard_links) @@ -436,9 +463,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) if (!delete_after) { /* I moved this here from recv_files() to prevent a race condition */ - if (recurse && delete_mode && !local_name && flist->count>0) { + if (recurse && delete_mode && !local_name && flist->count > 0) delete_files(flist); - } } if (fd_pair(error_pipe) < 0) { @@ -448,13 +474,13 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) io_flush(NORMAL_FLUSH); - if ((pid=do_fork()) == 0) { + if ((pid = do_fork()) == 0) { close(error_pipe[0]); if (f_in != f_out) close(f_out); /* we can't let two processes write to the socket at one time */ - io_multiplexing_close(); + close_multiplexing_out(); /* set place to send errors */ set_msg_fd_out(error_pipe[1]); @@ -473,12 +499,15 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) } am_generator = 1; + close_multiplexing_in(); + if (write_batch) + stop_write_batch(); close(error_pipe[1]); if (f_in != f_out) close(f_in); - io_start_buffering_out(f_out); + io_start_buffering_out(); set_msg_fd_in(error_pipe[0]); @@ -512,7 +541,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) argc, (long)getpid()); } - if (am_daemon && lp_read_only(module_id) && !am_sender) { + if (am_daemon && lp_read_only(module_id)) { rprintf(FERROR,"ERROR: module is read only\n"); exit_cleanup(RERR_SYNTAX); return; @@ -530,7 +559,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } } - io_start_buffering_in(f_in); + io_start_buffering_in(); if (delete_mode && !delete_excluded) recv_exclude_list(f_in); @@ -543,10 +572,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) filesfrom_fd = -1; } - if (read_batch) - flist = batch_flist; - else - flist = recv_file_list(f_in); + flist = recv_file_list(f_in); if (!flist) { rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); @@ -575,21 +601,21 @@ int child_main(int argc, char *argv[]) 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); + io_set_sock_fds(f_in, f_out); + setup_protocol(f_out, f_in); + if (protocol_version >= 23) - io_start_multiplex_out(f_out); + io_start_multiplex_out(); if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ - if (!read_batch) { - recv_exclude_list(f_in); - if (cvs_exclude) - add_cvs_excludes(); - } + + recv_exclude_list(f_in); + if (cvs_exclude) + add_cvs_excludes(); do_server_sender(f_in, f_out, argc, argv); } else { do_server_recv(f_in, f_out, argc, argv); @@ -609,26 +635,31 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) char *local_name = NULL; cleanup_child_pid = pid; - if (read_batch) - flist = batch_flist; - - set_nonblocking(f_in); - set_nonblocking(f_out); + if (read_batch) { + assert(am_sender == 0); + } else { + set_nonblocking(f_in); + set_nonblocking(f_out); + } + io_set_sock_fds(f_in, f_out); setup_protocol(f_out,f_in); - if (protocol_version >= 23) - io_start_multiplex_in(f_in); + if (protocol_version >= 23 && !read_batch) + io_start_multiplex_in(); if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ - io_start_buffering_out(f_out); + io_start_buffering_out(); if (cvs_exclude) add_cvs_excludes(); if (delete_mode && !delete_excluded) send_exclude_list(f_out); if (remote_filesfrom_file) filesfrom_fd = f_in; + + if (write_batch) + start_write_batch(f_out); if (!read_batch) /* don't write to pipe */ flist = send_file_list(f_out,argc,argv); if (verbose > 3) @@ -663,6 +694,8 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) filesfrom_fd = -1; } + if (write_batch) + start_write_batch(f_in); flist = recv_file_list(f_in); if (!flist || flist->count == 0) { rprintf(FINFO, "client: nothing to do: " @@ -726,7 +759,8 @@ static int start_client(int argc, char *argv[]) return rc; /* rsync:// always uses rsync server over direct socket connection */ - if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { + if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0 + && !read_batch) { char *host, *path; host = argv[0] + strlen(URL_PREFIX); @@ -839,9 +873,12 @@ static int start_client(int argc, char *argv[]) } argc--; } else { /* read_batch */ - am_sender = 1; local_server = 1; shell_path = argv[argc-1]; + if (find_colon(shell_path)) { + rprintf(FERROR, "remote destination is not allowed with --read-batch\n"); + exit_cleanup(RERR_SYNTAX); + } } if (shell_machine) { @@ -984,11 +1021,8 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig)) int main(int argc,char *argv[]) { int ret; - int orig_argc; - char **orig_argv; - - orig_argc = argc; - orig_argv = argv; + int orig_argc = argc; + char **orig_argv = argv; signal(SIGUSR1, sigusr1_handler); signal(SIGUSR2, sigusr2_handler); @@ -1037,8 +1071,24 @@ int main(int argc,char *argv[]) init_flist(); - if (write_batch && !am_server) { - write_batch_argvs_file(orig_argc, orig_argv); + if (write_batch || read_batch) { + if (write_batch) + write_batch_shell_file(orig_argc, orig_argv, argc); + + if (read_batch && strcmp(batch_name, "-") == 0) + batch_fd = STDIN_FILENO; + else { + batch_fd = do_open(batch_name, + write_batch ? O_WRONLY | O_CREAT | O_TRUNC + : O_RDONLY, S_IRUSR | S_IWUSR); + } + if (batch_fd < 0) { + rsyserr(FERROR, errno, "Batch file %s open error", + batch_name); + exit_cleanup(RERR_FILEIO); + } + if (read_batch) + read_stream_flags(batch_fd); } if (am_daemon && !am_server)