X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4a7481889c3841a7903ae7dfa51f8d1995266f25..19b27a485e833e08160ef0bae8f604c6f60e5ef8:/main.c diff --git a/main.c b/main.c index 2f422e28..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 @@ -25,6 +26,25 @@ struct stats stats; 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); @@ -105,13 +125,16 @@ static void report(int f) } -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) @@ -144,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++] = "."; @@ -236,6 +262,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()); @@ -267,7 +294,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) } 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); } @@ -319,20 +351,20 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) 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(); /* finally we go to sleep until our parent kills us - with a USR2 signal. We sleepp for a short time as on + with a USR2 signal. We sleep for a short time as on some OSes a signal won't interrupt a sleep! */ - while (1) sleep(1); + while (1) msleep(20); } close(recv_pipe[1]); close(error_pipe[1]); - io_close_input(f_in); if (f_in != f_out) close(f_in); io_start_buffering(f_out); @@ -435,14 +467,21 @@ 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 list_only; extern int remote_version; + extern pid_t cleanup_child_pid; + + cleanup_child_pid = pid; set_nonblocking(f_in); set_nonblocking(f_out); @@ -471,21 +510,26 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) io_flush(); wait_process(pid, &status); } - report(-1); 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); } @@ -500,7 +544,7 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) wait_process(pid, &status); } - return status | status2; + return MAX(status, status2); } static char *find_colon(char *s) @@ -518,23 +562,31 @@ 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, 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; @@ -550,12 +602,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) { @@ -565,7 +617,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++; @@ -617,6 +669,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); @@ -634,9 +691,14 @@ static RETSIGTYPE sigusr1_handler(int val) { } 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[]) { extern int am_root; @@ -644,9 +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); @@ -662,15 +726,13 @@ int main(int argc,char *argv[]) carried across */ orig_umask = (int)umask(0); - if (!parse_arguments(argc, argv, 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); @@ -707,6 +769,8 @@ int main(int argc,char *argv[]) start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv); } - return start_client(argc, argv); + ret = start_client(argc, argv); + exit_cleanup(ret); + return ret; }