X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9fb3f7a9aba781b901c0b06fdf700a3701870d0b..066696644f8fa36f5ca3be116d015ded400266de:/main.c diff --git a/main.c b/main.c index 37c46183..b571b3a8 100644 --- a/main.c +++ b/main.c @@ -26,6 +26,16 @@ time_t starttime = 0; extern struct stats stats; extern int verbose; +/* there's probably never more than at most 2 outstanding child processes, + * but set it higher just in case. + */ +#define MAXCHILDPROCS 5 + +struct pid_status { + pid_t pid; + int status; +} pid_stat_table[MAXCHILDPROCS]; + static void show_malloc_stats(void); /**************************************************************************** @@ -33,11 +43,27 @@ 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) { + pid_t waited_pid; + int cnt; + + while ((waited_pid = waitpid(pid, status, WNOHANG)) == 0) { msleep(20); io_flush(); } + if ((waited_pid == -1) && (errno == ECHILD)) { + /* status of requested child no longer available. + * check to see if it was processed by the sigchld_handler. + */ + for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) { + if (pid == pid_stat_table[cnt].pid) { + *status = pid_stat_table[cnt].status; + pid_stat_table[cnt].pid = 0; + break; + } + } + } + /* 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 @@ -171,9 +197,11 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int int i,argc=0; pid_t ret; char *tok,*dir=NULL; + int dash_l_set = 0; extern int local_server; extern char *rsync_path; extern int blocking_io; + extern int daemon_over_rsh; extern int read_batch; if (!read_batch && !local_server) { @@ -189,15 +217,22 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int args[argc++] = tok; } + /* check to see if we've already been given '-l user' in + the remote-shell command */ + for (i = 0; i < argc-1; i++) { + if (!strcmp(args[i], "-l") && args[i+1][0] != '-') + dash_l_set = 1; + } + #if HAVE_REMSH /* remsh (on HPUX) takes the arguments the other way around */ args[argc++] = machine; - if (user) { + if (user && !(daemon_over_rsh && dash_l_set)) { args[argc++] = "-l"; args[argc++] = user; } #else - if (user) { + if (user && !(daemon_over_rsh && dash_l_set)) { args[argc++] = "-l"; args[argc++] = user; } @@ -215,7 +250,7 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int args[argc++] = "."; - if (path && *path) + if (!daemon_over_rsh && path && *path) args[argc++] = path; args[argc] = NULL; @@ -426,6 +461,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) } io_flush(); + io_set_error_fd(-1); kill(pid, SIGUSR2); wait_process(pid, &status); return status; @@ -667,14 +703,16 @@ static int start_client(int argc, char *argv[]) extern int am_sender; extern char *shell_cmd; extern int rsync_port; + extern int daemon_over_rsh; extern int read_batch; int rc; /* Don't clobber argv[] so that ps(1) can still show the right command line. */ - if ((rc = copy_argv (argv))) + if ((rc = copy_argv(argv))) return rc; + /* rsync:// always uses rsync server over direct socket connection */ if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { char *host, *path; @@ -684,7 +722,7 @@ static int start_client(int argc, char *argv[]) *p = 0; path = p+1; } else { - path=""; + path = ""; } p = strchr(host,':'); if (p) { @@ -695,12 +733,17 @@ static int start_client(int argc, char *argv[]) } if (!read_batch) { - p = find_colon(argv[0]); + p = find_colon(argv[0]); if (p) { if (p[1] == ':') { /* double colon */ *p = 0; - return start_socket_client(argv[0], p+2, argc-1, argv+1); + if (!shell_cmd) { + return start_socket_client(argv[0], p+2, + argc-1, argv+1); + } + p++; + daemon_over_rsh = 1; } if (argc < 1) { @@ -717,12 +760,37 @@ static int start_client(int argc, char *argv[]) } else { am_sender = 1; + /* rsync:// destination uses rsync server over direct socket */ + if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) { + char *host, *path; + + host = argv[argc-1] + 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); + } + p = find_colon(argv[argc-1]); if (!p) { local_server = 1; - } else if (p[1] == ':') { + } else if (p[1] == ':') { /* double colon */ *p = 0; - return start_socket_client(argv[argc-1], p+2, argc-1, argv); + if (!shell_cmd) { + return start_socket_client(argv[argc-1], p+2, + argc-1, argv); + } + p++; + daemon_over_rsh = 1; } if (argc < 2) { @@ -773,8 +841,19 @@ static int start_client(int argc, char *argv[]) list_only = 1; } - pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); - + pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path, + &f_in,&f_out); + + /* if we're running an rsync server on the remote host over a + remote shell command, we need to do the RSYNCD protocol first */ + if (daemon_over_rsh) { + int tmpret; + tmpret = start_inband_exchange(shell_user, shell_path, + f_in, f_out, argc); + if (tmpret < 0) + return tmpret; + } + ret = client_run(f_in, f_out, pid, argc, argv); fflush(stdout); @@ -796,7 +875,24 @@ static RETSIGTYPE sigusr2_handler(int UNUSED(val)) { static RETSIGTYPE sigchld_handler(int UNUSED(val)) { #ifdef WNOHANG - while (waitpid(-1, NULL, WNOHANG) > 0) ; + int cnt, status; + pid_t pid; + /* An empty waitpid() loop was put here by Tridge and we could never + * get him to explain why he put it in, so rather than taking it + * out we're instead saving the child exit statuses for later use. + * The waitpid() loop presumably eliminates all possibility of leaving + * zombie children, maybe that's why he did it. + */ + while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { + /* save the child's exit status */ + for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) { + if (pid_stat_table[cnt].pid == 0) { + pid_stat_table[cnt].pid = pid; + pid_stat_table[cnt].status = status; + break; + } + } + } #endif } @@ -916,9 +1012,8 @@ int main(int argc,char *argv[]) write_batch_argvs_file(orig_argc, orig_argv); } - if (am_daemon) { + if (am_daemon && !am_server) return daemon_main(); - } if (argc < 1) { usage(FERROR); @@ -938,6 +1033,8 @@ int main(int argc,char *argv[]) if (am_server) { set_nonblocking(STDIN_FILENO); set_nonblocking(STDOUT_FILENO); + if (am_daemon) + return start_daemon(STDIN_FILENO, STDOUT_FILENO); start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv); }