X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/26f76b7912cbd004c707e6304abdc99830ad5680..2adbcdc7ea7e708a903ed904ee25d4cb27c97e2e:/main.c diff --git a/main.c b/main.c index 87711c29..085e5785 100644 --- a/main.c +++ b/main.c @@ -27,6 +27,7 @@ extern struct stats stats; extern int am_root; extern int am_server; extern int am_sender; +extern int am_generator; extern int am_daemon; extern int verbose; extern int blocking_io; @@ -42,20 +43,24 @@ extern int local_server; extern int log_got_error; extern int module_id; extern int orig_umask; +extern int keep_dirlinks; extern int preserve_hard_links; 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 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, * but set it higher just in case. @@ -82,7 +87,7 @@ void wait_process(pid_t pid, int *status) io_flush(FULL_FLUSH); } - if ((waited_pid == -1) && (errno == ECHILD)) { + if (waited_pid == -1 && errno == ECHILD) { /* status of requested child no longer available. * check to see if it was processed by the sigchld_handler. */ @@ -103,10 +108,20 @@ 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); - int send_stats; if (do_stats && verbose > 1) { /* These come out from every process */ @@ -114,43 +129,39 @@ static void report(int f) show_flist_stats(); } + if (am_generator) + return; + if (am_daemon) { log_exit(0, __FILE__, __LINE__); - if (f == -1 || !am_sender) return; + if (f == -1 || !am_sender) + return; } - send_stats = verbose || protocol_version >= 20; if (am_server) { - if (am_sender && send_stats) { - 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); + if (am_sender) { + write_longint(f, total_read); + write_longint(f, total_written); + write_longint(f, stats.total_size); } return; } /* this is the client */ - if (!am_sender && send_stats) { - int64 r; - stats.total_written = read_longint(f); - /* store total_read in a temporary, read_longint changes it */ - r = read_longint(f); + if (!am_sender) { + 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) { - if (!am_sender && !send_stats) { - /* missing the bytes written by the generator */ - rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n"); - rprintf(FINFO, "Use --stats -v to show stats\n"); - return; - } rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files); rprintf(FINFO,"Number of files transferred: %d\n", stats.num_transferred_files); @@ -164,19 +175,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); @@ -198,12 +209,14 @@ static void show_malloc_stats(void) getpid(), am_server ? "server " : "", am_daemon ? "daemon " : "", - am_sender ? "sender" : "receiver"); + who_am_i()); rprintf(FINFO, " arena: %10d (bytes from sbrk)\n", mi.arena); rprintf(FINFO, " ordblks: %10d (chunks not in use)\n", mi.ordblks); rprintf(FINFO, " smblks: %10d\n", mi.smblks); rprintf(FINFO, " hblks: %10d (chunks from mmap)\n", mi.hblks); rprintf(FINFO, " hblkhd: %10d (bytes from mmap)\n", mi.hblkhd); + rprintf(FINFO, " allmem: %10d (bytes from sbrk + mmap)\n", + mi.arena + mi.hblkhd); rprintf(FINFO, " usmblks: %10d\n", mi.usmblks); rprintf(FINFO, " fsmblks: %10d\n", mi.fsmblks); rprintf(FINFO, " uordblks: %10d (bytes used)\n", mi.uordblks); @@ -214,12 +227,13 @@ static void show_malloc_stats(void) /* Start the remote shell. cmd may be NULL to use the default. */ -static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) +static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, + int *f_in, int *f_out) { - char *args[100]; - int i,argc=0; + int i, argc = 0; + char *args[MAX_ARGS]; pid_t ret; - char *tok,*dir=NULL; + char *tok, *dir = NULL; int dash_l_set = 0; if (!read_batch && !local_server) { @@ -232,7 +246,12 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int if (!cmd) goto oom; - for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) { + for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) { + /* Comparison leaves rooms for server_options(). */ + if (argc >= MAX_ARGS - 100) { + rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); + exit_cleanup(RERR_SYNTAX); + } args[argc++] = tok; } @@ -271,6 +290,11 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int } server_options(args,&argc); + + if (argc >= MAX_ARGS - 2) { + rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); + exit_cleanup(RERR_SYNTAX); + } } args[argc++] = "."; @@ -282,20 +306,23 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int if (verbose > 3) { rprintf(FINFO,"cmd="); - for (i=0;i 0) rprintf(FINFO,"created directory %s\n",name); } - if (!push_dir(name, 0)) { - rprintf(FERROR, "push_dir %s failed: %s (2)\n", - full_fname(name), strerror(errno)); + if (!push_dir(name)) { + rsyserr(FERROR, errno, "push_dir#2 %s failed", + full_fname(name)); exit_cleanup(RERR_FILESELECT); } @@ -363,12 +387,20 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) struct file_list *flist; char *dir = argv[0]; - if (verbose > 2) - rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid()); + if (verbose > 2) { + rprintf(FINFO, "server_sender starting pid=%ld\n", + (long)getpid()); + } - if (!relative_paths && !push_dir(dir, 0)) { - rprintf(FERROR, "push_dir %s failed: %s (3)\n", - full_fname(dir), strerror(errno)); + if (am_daemon && lp_write_only(module_id)) { + rprintf(FERROR, "ERROR: module is write only\n"); + exit_cleanup(RERR_SYNTAX); + return; + } + + if (!relative_paths && !push_dir(dir)) { + rsyserr(FERROR, errno, "push_dir#3 %s failed", + full_fname(dir)); exit_cleanup(RERR_FILESELECT); } argc--; @@ -378,12 +410,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) int l = strlen(dir); if (strcmp(dir,"/") == 0) l = 0; - for (i=0;i= 24) { /* send a final goodbye message */ @@ -481,13 +521,15 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) { int status; struct file_list *flist; - char *local_name=NULL; + char *local_name = NULL; char *dir = NULL; - 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=%ld\n", + 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; @@ -498,14 +540,14 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) dir = argv[0]; argc--; argv++; - if (!am_daemon && !push_dir(dir, 0)) { - rprintf(FERROR, "push_dir %s failed: %s (4)\n", - full_fname(dir), strerror(errno)); + if (!am_daemon && !push_dir(dir)) { + rsyserr(FERROR, errno, "push_dir#4 %s failed", + full_fname(dir)); exit_cleanup(RERR_FILESELECT); } } - io_start_buffering_in(f_in); + io_start_buffering_in(); if (delete_mode && !delete_excluded) recv_exclude_list(f_in); @@ -518,10 +560,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); @@ -530,7 +569,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) if (argc > 0) { if (strcmp(dir,".")) { argv[0] += strlen(dir); - if (argv[0][0] == '/') argv[0]++; + if (argv[0][0] == '/') + argv[0]++; } local_name = get_local_name(flist,argv[0]); } @@ -549,20 +589,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) { - if (!read_batch) { - recv_exclude_list(f_in); - if (cvs_exclude) - add_cvs_excludes(); - } + keep_dirlinks = 0; /* Must be disabled on the sender. */ + + 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); @@ -582,25 +623,40 @@ 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) { + /* This is the heart of the read_batch approach: + * Switcher-roo the file descriptors, and + * nobody's the wiser. */ + close(f_in); + close(f_out); + f_in = batch_fd; + f_out = do_open("/dev/null", O_WRONLY, 0); + 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) { - io_start_buffering_out(f_out); + keep_dirlinks = 0; /* Must be disabled on the sender. */ + 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); + /* Can be unconditional, but this is theoretically + * more efficent for read_batch case. */ if (!read_batch) /* don't write to pipe */ flist = send_file_list(f_out,argc,argv); if (verbose > 3) @@ -624,11 +680,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) exit_cleanup(status); } - if (argc == 0) { + if (argc == 0) list_only = 1; - } - if (!write_batch) + /* Can be unconditional, but this is theoretically more + * efficient for the read_batch case. */ + if (!read_batch) send_exclude_list(f_out); if (filesfrom_fd >= 0) { @@ -636,6 +693,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: " @@ -699,7 +758,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); @@ -718,9 +778,9 @@ static int start_client(int argc, char *argv[]) return start_socket_client(host, path, argc-1, argv+1); } - if (!read_batch) { + if (!read_batch) { /* for read_batch, NO source is specified */ p = find_colon(argv[0]); - if (p) { + if (p) { /* source is remote */ if (remote_filesfrom_file && remote_filesfrom_file != files_from + 1 && strncmp(files_from, argv[0], p-argv[0]+1) != 0) { @@ -738,7 +798,7 @@ static int start_client(int argc, char *argv[]) daemon_over_rsh = 1; } - if (argc < 1) { + if (argc < 1) { /* destination required */ usage(FERROR); exit_cleanup(RERR_SYNTAX); } @@ -747,9 +807,8 @@ static int start_client(int argc, char *argv[]) *p = 0; shell_machine = argv[0]; shell_path = p+1; - argc--; argv++; - } else { + } else { /* source is local */ am_sender = 1; /* rsync:// destination uses rsync server over direct socket */ @@ -772,7 +831,7 @@ static int start_client(int argc, char *argv[]) return start_socket_client(host, path, argc-1, argv); } - p = find_colon(argv[argc-1]); + p = find_colon(argv[argc-1]); /* look in dest arg */ if (p && remote_filesfrom_file && remote_filesfrom_file != files_from + 1 && strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) { @@ -780,7 +839,7 @@ static int start_client(int argc, char *argv[]) "--files-from hostname is not transfer hostname\n"); exit_cleanup(RERR_SYNTAX); } - if (!p) { + if (!p) { /* no colon found, so src & dest are local */ local_server = 1; if (remote_filesfrom_file) { rprintf(FERROR, @@ -810,16 +869,19 @@ static int start_client(int argc, char *argv[]) shell_machine = argv[argc-1]; shell_path = p+1; } - argc--; } - } else { - am_sender = 1; + argc--; + } else { /* read_batch */ 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) { - p = strchr(shell_machine,'@'); + p = strrchr(shell_machine,'@'); if (p) { *p = 0; shell_user = shell_machine; @@ -835,12 +897,14 @@ static int start_client(int argc, char *argv[]) shell_path?shell_path:""); } + /* for remote source, only single dest arg can remain ... */ if (!am_sender && argc > 1) { usage(FERROR); exit_cleanup(RERR_SYNTAX); } - if (argc == 0 && !am_sender) { + /* ... or no dest at all */ + if (!am_sender && argc == 0) { list_only = 1; } @@ -956,11 +1020,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); @@ -973,7 +1034,7 @@ int main(int argc,char *argv[]) #endif /* def MAINTAINER_MODE */ starttime = time(NULL); - am_root = (getuid() == 0); + am_root = (MY_UID() == 0); memset(&stats, 0, sizeof(stats)); @@ -1005,10 +1066,26 @@ int main(int argc,char *argv[]) * (implemented by forking "pwd" and reading its output) doesn't * work when there are other child processes. Also, on all systems * that implement getcwd that way "pwd" can't be found after chroot. */ - push_dir(NULL,0); + push_dir(NULL); + + 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 (am_daemon && !am_server) @@ -1022,13 +1099,6 @@ int main(int argc,char *argv[]) if (dry_run) verbose = MAX(verbose,1); -#ifndef SUPPORT_LINKS - if (!am_server && preserve_links) { - rprintf(FERROR,"ERROR: symbolic links not supported\n"); - exit_cleanup(RERR_UNSUPPORTED); - } -#endif - if (am_server) { set_nonblocking(STDIN_FILENO); set_nonblocking(STDOUT_FILENO);