X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ae682c3e115aae1e15811e1411f5e7e3438d3193..ff81e809f46293171a332a2faa320aca57277b4b:/main.c diff --git a/main.c b/main.c index 7d04adf6..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 @@ -35,6 +36,12 @@ void wait_process(pid_t pid, int *status) 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); } @@ -118,6 +125,20 @@ static void report(int f) } +/* 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]; @@ -349,9 +370,9 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) 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]); @@ -458,13 +479,17 @@ 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); @@ -502,13 +527,18 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[]) 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); } @@ -523,7 +553,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) @@ -541,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; @@ -553,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; @@ -573,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) { @@ -588,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++; @@ -640,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); @@ -657,6 +699,8 @@ static RETSIGTYPE sigusr1_handler(int val) { } static RETSIGTYPE sigusr2_handler(int val) { + extern int log_got_error; + if (log_got_error) _exit(RERR_FILEIO); _exit(0); } @@ -667,6 +711,7 @@ 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); @@ -685,15 +730,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); @@ -730,6 +773,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; }