X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1f0610ef8259aa11df8d25e48c06d19d715bff23..ff81e809f46293171a332a2faa320aca57277b4b:/main.c diff --git a/main.c b/main.c index 900cd64e..dae6e790 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,6 @@ -/* - Copyright (C) Andrew Tridgell 1996 +/* -*- c-file-style: "linux" -*- + + Copyright (C) 1996-2001 by Andrew Tridgell Copyright (C) Paul Mackerras 1996 This program is free software; you can redistribute it and/or modify @@ -23,10 +24,27 @@ time_t starttime = 0; struct stats stats; -extern int csum_length; - 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(); + } + + /* TODO: If the child exited on a signal, then log an + * appropriate error message. Perhaps we should also accept a + * message describing the purpose of the child. Also indicate + * this to the caller so that thhey know something went + * wrong. */ + *status = WEXITSTATUS(*status); +} + static void report(int f) { time_t t = time(NULL); @@ -34,32 +52,46 @@ static void report(int f) extern int am_sender; extern int am_daemon; extern int do_stats; + extern int remote_version; + int send_stats; if (am_daemon) { log_exit(0, __FILE__, __LINE__); if (f == -1 || !am_sender) return; } - if (!verbose) return; - - if (am_server && !am_sender) return; - - if (am_server && am_sender) { - write_longint(f,stats.total_read); - write_longint(f,stats.total_written); - write_longint(f,stats.total_size); + send_stats = verbose || (remote_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); + } return; } - - if (!am_sender) { + + /* 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); stats.total_size = read_longint(f); stats.total_read = r; } 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); @@ -78,19 +110,35 @@ static void report(int f) (double)stats.total_read); } - rprintf(FINFO,"wrote %.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", - (double)stats.total_size, - (1.0*stats.total_size)/(stats.total_written+stats.total_read)); + if (verbose || do_stats) { + rprintf(FINFO,"wrote %.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", + (double)stats.total_size, + (1.0*stats.total_size)/(stats.total_written+stats.total_read)); + } fflush(stdout); fflush(stderr); } +/* Start the remote shell. cmd may be NULL to use the default. */ +/* TODO: When the shell exits, look at its return value, as this may + * well tell us if something went wrong in trying to connect to the + * remote machine. Although it doesn't seem to be specified anywhere, + * ssh and the shell seem to return these values: + * + * 124 if the command exited with status 255 + * 125 if the command is killed by a signal + * 126 if the command cannot be run + * 127 if the command is not found + * + * and we could use this to give a better explanation if the remote + * command is not found. + */ static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) { char *args[100]; @@ -98,6 +146,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) @@ -130,6 +179,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++] = "."; @@ -192,7 +244,7 @@ static char *get_local_name(struct file_list *flist,char *name) return name; } - if (flist->count == 1) + if (flist->count <= 1) return name; if (do_mkdir(name,0777 & ~orig_umask) != 0) { @@ -222,6 +274,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()); @@ -247,17 +300,18 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) argv[0] = "."; } - set_nonblocking(f_out); - if (f_in != f_out) - set_nonblocking(f_in); - flist = send_file_list(f_out,argc,argv); if (!flist || flist->count == 0) { exit_cleanup(0); } 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); } @@ -268,45 +322,79 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) int pid; int status=0; int recv_pipe[2]; + int error_pipe[2]; extern int preserve_hard_links; + extern int delete_after; + extern int recurse; + extern int delete_mode; + extern int remote_version; if (preserve_hard_links) init_hard_links(flist); - if (pipe(recv_pipe) < 0) { + if (!delete_after) { + /* I moved this here from recv_files() to prevent a race condition */ + if (recurse && delete_mode && !local_name && flist->count>0) { + delete_files(flist); + } + } + + if (fd_pair(recv_pipe) < 0) { rprintf(FERROR,"pipe failed in do_recv\n"); exit_cleanup(RERR_SOCKETIO); } + + if (fd_pair(error_pipe) < 0) { + rprintf(FERROR,"error pipe failed in do_recv\n"); + exit_cleanup(RERR_SOCKETIO); + } io_flush(); if ((pid=do_fork()) == 0) { close(recv_pipe[0]); + close(error_pipe[0]); if (f_in != f_out) close(f_out); - set_nonblocking(f_in); - set_nonblocking(recv_pipe[1]); + /* we can't let two processes write to the socket at one time */ + io_multiplexing_close(); + + /* set place to send errors */ + 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(); - _exit(0); + /* finally we go to sleep until our parent kills us + with a USR2 signal. We sleep for a short time as on + some OSes a signal won't interrupt a sleep! */ + while (1) msleep(20); } close(recv_pipe[1]); - io_close_input(f_in); + close(error_pipe[1]); if (f_in != f_out) close(f_in); - set_nonblocking(f_out); - set_nonblocking(recv_pipe[0]); - io_start_buffering(f_out); + io_set_error_fd(error_pipe[0]); + generate_files(f_out,flist,local_name,recv_pipe[0]); + read_int(recv_pipe[0]); + close(recv_pipe[0]); + if (remote_version >= 24) { + /* send a final goodbye message */ + write_int(f_out, -1); + } io_flush(); - waitpid(pid, &status, 0); + + kill(pid, SIGUSR2); + wait_process(pid, &status); return status; } @@ -318,10 +406,20 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) char *local_name=NULL; char *dir = NULL; extern int delete_mode; + extern int delete_excluded; extern int am_daemon; + extern int module_id; + extern int am_sender; if (verbose > 2) rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid()); + + if (am_daemon && lp_read_only(module_id) && !am_sender) { + rprintf(FERROR,"ERROR: module is read only\n"); + exit_cleanup(RERR_SYNTAX); + return; + } + if (argc > 0) { dir = argv[0]; @@ -334,12 +432,12 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } } - if (delete_mode) + if (delete_mode && !delete_excluded) recv_exclude_list(f_in); flist = recv_file_list(f_in); - if (!flist || flist->count == 0) { - rprintf(FERROR,"server_recv: nothing to do\n"); + if (!flist) { + rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); } @@ -360,13 +458,16 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) { extern int cvs_exclude; extern int am_sender; + extern int remote_version; - set_nonblocking(f_out); - if (f_in != f_out) - set_nonblocking(f_in); - setup_protocol(f_out, f_in); + set_nonblocking(f_in); + set_nonblocking(f_out); + + if (remote_version >= 23) + io_start_multiplex_out(f_out); + if (am_sender) { recv_exclude_list(f_in); if (cvs_exclude) @@ -378,49 +479,66 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) exit_cleanup(0); } + +/* + * This is called once the connection has been negotiated. It is used + * for rsyncd, remote-shell, and local connections. + */ int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) { struct file_list *flist; int status = 0, status2 = 0; char *local_name = NULL; extern int am_sender; - 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) + io_start_multiplex_in(f_in); if (am_sender) { extern int cvs_exclude; extern int delete_mode; + extern int delete_excluded; if (cvs_exclude) add_cvs_excludes(); - if (delete_mode) + if (delete_mode && !delete_excluded) send_exclude_list(f_out); flist = send_file_list(f_out,argc,argv); if (verbose > 3) rprintf(FINFO,"file list sent\n"); - set_nonblocking(f_out); - if (f_in != f_out) - set_nonblocking(f_in); - send_files(flist,f_out,f_in); if (pid != -1) { if (verbose > 3) rprintf(FINFO,"client_run waiting on %d\n",pid); io_flush(); - waitpid(pid, &status, 0); + wait_process(pid, &status); + } + if (remote_version >= 24) { + /* final goodbye message */ + read_int(f_in); } report(-1); exit_cleanup(status); } - if (argc == 0) list_only = 1; + if (argc == 0) { + extern int list_only; + list_only = 1; + } send_exclude_list(f_out); flist = recv_file_list(f_in); if (!flist || flist->count == 0) { - rprintf(FINFO,"client: nothing to do\n"); + rprintf(FINFO, "client: nothing to do: " + "perhaps you need to specify some filenames or " + "the --recursive option?\n"); exit_cleanup(0); } @@ -432,10 +550,10 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) if (verbose > 3) rprintf(FINFO,"client_run2 waiting on %d\n",pid); io_flush(); - waitpid(pid, &status, 0); + wait_process(pid, &status); } - return status | status2; + return MAX(status, status2); } static char *find_colon(char *s) @@ -453,6 +571,12 @@ static char *find_colon(char *s) return p; } + +/* + * Start a client for either type of remote connection. Work out + * whether the arguments request a remote shell or rsyncd connection, + * and call the appropriate connection function, then run_client. + */ static int start_client(int argc, char *argv[]) { char *p; @@ -465,11 +589,12 @@ static int start_client(int argc, char *argv[]) extern int am_sender; extern char *shell_cmd; extern int rsync_port; + char *argv0 = strdup(argv[0]); - if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { + if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) { char *host, *path; - host = argv[0] + strlen(URL_PREFIX); + host = argv0 + strlen(URL_PREFIX); p = strchr(host,'/'); if (p) { *p = 0; @@ -485,12 +610,12 @@ static int start_client(int argc, char *argv[]) return start_socket_client(host, path, argc-1, argv+1); } - p = find_colon(argv[0]); + p = find_colon(argv0); if (p) { if (p[1] == ':') { *p = 0; - return start_socket_client(argv[0], p+2, argc-1, argv+1); + return start_socket_client(argv0, p+2, argc-1, argv+1); } if (argc < 1) { @@ -500,7 +625,7 @@ static int start_client(int argc, char *argv[]) am_sender = 0; *p = 0; - shell_machine = argv[0]; + shell_machine = argv0; shell_path = p+1; argc--; argv++; @@ -552,6 +677,11 @@ static int start_client(int argc, char *argv[]) usage(FERROR); exit_cleanup(RERR_SYNTAX); } + + if (argc == 0 && !am_sender) { + extern int list_only; + list_only = 1; + } pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); @@ -568,6 +698,12 @@ static RETSIGTYPE sigusr1_handler(int val) { exit_cleanup(RERR_SIGNAL); } +static RETSIGTYPE sigusr2_handler(int val) { + extern int log_got_error; + if (log_got_error) _exit(RERR_FILEIO); + _exit(0); +} + int main(int argc,char *argv[]) { extern int am_root; @@ -575,8 +711,10 @@ int main(int argc,char *argv[]) extern int dry_run; extern int am_daemon; extern int am_server; + int ret; signal(SIGUSR1, sigusr1_handler); + signal(SIGUSR2, sigusr2_handler); starttime = time(NULL); am_root = (getuid() == 0); @@ -592,20 +730,24 @@ int main(int argc,char *argv[]) carried across */ orig_umask = (int)umask(0); - if (!parse_arguments(argc, argv)) { + if (!parse_arguments(&argc, (const char ***) &argv, 1)) { + /* FIXME: We ought to call the same error-handling + * code here, rather than relying on getopt. */ + option_error(); exit_cleanup(RERR_SYNTAX); } - argc -= optind; - argv += optind; - optind = 0; - - signal(SIGCHLD,SIG_IGN); signal(SIGINT,SIGNAL_CAST sig_int); signal(SIGPIPE,SIGNAL_CAST sig_int); signal(SIGHUP,SIGNAL_CAST sig_int); signal(SIGTERM,SIGNAL_CAST sig_int); + /* Initialize push_dir here because on some old systems getcwd + (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); + if (am_daemon) { return daemon_main(); } @@ -626,9 +768,13 @@ 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); } - return start_client(argc, argv); + ret = start_client(argc, argv); + exit_cleanup(ret); + return ret; }