X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b11ed3b1504d526a4b571bc3d80f4e5f1628dc75..19b27a485e833e08160ef0bae8f604c6f60e5ef8:/main.c diff --git a/main.c b/main.c index 2cd5912b..f696474c 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,35 +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) { - syslog(LOG_INFO,"wrote %.0f bytes read %.0f bytes total size %.0f\n", - (double)stats.total_written, - (double)stats.total_read, - (double)stats.total_size); + 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); @@ -81,26 +110,31 @@ 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); } -static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) +/* 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) { char *args[100]; - int i,argc=0, ret; + int i,argc=0; + pid_t ret; char *tok,*dir=NULL; extern int local_server; extern char *rsync_path; + extern int blocking_io; if (!local_server) { if (!cmd) @@ -133,6 +167,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++] = "."; @@ -174,33 +211,33 @@ static char *get_local_name(struct file_list *flist,char *name) if (verbose > 2) rprintf(FINFO,"get_local_name count=%d %s\n", - flist->count, name); + flist->count, NS(name)); + + if (!name) + return NULL; if (do_stat(name,&st) == 0) { if (S_ISDIR(st.st_mode)) { if (!push_dir(name, 0)) { rprintf(FERROR,"push_dir %s : %s (1)\n", name,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } return NULL; } if (flist->count > 1) { rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n"); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } return name; } - if (flist->count == 1) + if (flist->count <= 1) return name; - if (!name) - return NULL; - if (do_mkdir(name,0777 & ~orig_umask) != 0) { rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILEIO); } else { if (verbose > 0) rprintf(FINFO,"created directory %s\n",name); @@ -209,7 +246,7 @@ static char *get_local_name(struct file_list *flist,char *name) if (!push_dir(name, 0)) { rprintf(FERROR,"push_dir %s : %s (2)\n", name,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } return NULL; @@ -225,13 +262,14 @@ 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()); if (!relative_paths && !push_dir(dir, 0)) { rprintf(FERROR,"push_dir %s: %s (3)\n",dir,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } argc--; argv++; @@ -255,12 +293,13 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) exit_cleanup(0); } - set_nonblocking(f_out); - if (f_in != f_out) - set_nonblocking(f_in); - 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); } @@ -271,43 +310,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(1); + 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); + /* 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); - 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; } @@ -319,10 +394,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]; @@ -331,17 +416,17 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) if (!am_daemon && !push_dir(dir, 0)) { rprintf(FERROR,"push_dir %s : %s (4)\n", dir,strerror(errno)); - exit_cleanup(1); + exit_cleanup(RERR_FILESELECT); } } - 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"); - exit_cleanup(1); + if (!flist) { + rprintf(FERROR,"server_recv: recv_file_list error\n"); + exit_cleanup(RERR_FILESELECT); } if (argc > 0) { @@ -361,9 +446,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; 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) @@ -375,46 +467,69 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) exit_cleanup(0); } -int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) + +/* + * 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, pid_t pid, int argc, char *argv[]) { struct file_list *flist; int status = 0, status2 = 0; char *local_name = NULL; extern int am_sender; + extern int remote_version; + extern pid_t cleanup_child_pid; + + cleanup_child_pid = pid; + + 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) { + 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); } @@ -426,10 +541,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) @@ -447,34 +562,62 @@ 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; char *shell_machine = NULL; char *shell_path = NULL; char *shell_user = NULL; - int pid, ret; + int ret; + pid_t pid; int f_in,f_out; extern int local_server; extern int am_sender; extern char *shell_cmd; + extern int rsync_port; + char *argv0 = strdup(argv[0]); + + if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) { + char *host, *path; + + host = argv0 + strlen(URL_PREFIX); + p = strchr(host,'/'); + if (p) { + *p = 0; + path = p+1; + } else { + path=""; + } + p = strchr(host,':'); + if (p) { + rsync_port = atoi(p+1); + *p = 0; + } + 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 < 2) { + if (argc < 1) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } am_sender = 0; *p = 0; - shell_machine = argv[0]; + shell_machine = argv0; shell_path = p+1; argc--; argv++; @@ -491,7 +634,7 @@ static int start_client(int argc, char *argv[]) if (argc < 2) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } if (local_server) { @@ -522,9 +665,14 @@ static int start_client(int argc, char *argv[]) shell_path?shell_path:""); } - if (!am_sender && argc != 1) { + if (!am_sender && argc > 1) { usage(FERROR); - exit_cleanup(1); + 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); @@ -538,8 +686,17 @@ static int start_client(int argc, char *argv[]) } -RETSIGTYPE sigusr1_handler(int val) { - exit_cleanup(1); +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_PARTIAL); + _exit(0); +} + +static RETSIGTYPE sigchld_handler(int val) { } int main(int argc,char *argv[]) @@ -549,8 +706,11 @@ 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); + signal(SIGCHLD, sigchld_handler); starttime = time(NULL); am_root = (getuid() == 0); @@ -559,25 +719,30 @@ int main(int argc,char *argv[]) if (argc < 2) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } /* we set a 0 umask so that correct file permissions can be carried across */ orig_umask = (int)umask(0); - if (!parse_arguments(argc, argv)) { - exit_cleanup(1); + 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(); @@ -585,7 +750,7 @@ int main(int argc,char *argv[]) if (argc < 1) { usage(FERROR); - exit_cleanup(1); + exit_cleanup(RERR_SYNTAX); } if (dry_run) @@ -594,14 +759,18 @@ int main(int argc,char *argv[]) #ifndef SUPPORT_LINKS if (!am_server && preserve_links) { rprintf(FERROR,"ERROR: symbolic links not supported\n"); - exit_cleanup(1); + exit_cleanup(RERR_UNSUPPORTED); } #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; }