X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e8a96e275edbec0b69eba596a410ba011ec0ffec..97d8e7095f191c38783a4e14d1bc502a49e8867a:/main.c diff --git a/main.c b/main.c index 42f4a6f9..a9418f7f 100644 --- a/main.c +++ b/main.c @@ -45,12 +45,10 @@ extern int copy_links; extern int keep_dirlinks; extern int preserve_hard_links; extern int protocol_version; +extern int always_checksum; extern int recurse; -extern int fuzzy_basis; extern int relative_paths; extern int rsync_port; -extern int inplace; -extern int make_backups; extern int whole_file; extern int read_batch; extern int write_batch; @@ -60,13 +58,13 @@ extern int filesfrom_fd; extern pid_t cleanup_child_pid; extern struct stats stats; extern char *filesfrom_host; -extern char *partial_dir; -extern char *basis_dir[]; extern char *rsync_path; extern char *shell_cmd; extern char *batch_name; +extern char curr_dir[MAXPATHLEN]; int local_server = 0; +int pre_checksum = 0; struct file_list *the_file_list; /* There's probably never more than at most 2 outstanding child processes, @@ -83,38 +81,57 @@ static int64 total_read, total_written; static void show_malloc_stats(void); -/**************************************************************************** -wait for a process to exit, calling io_flush while waiting -****************************************************************************/ -void wait_process(pid_t pid, int *status) +/* Works like waitpid(), but if we already harvested the child pid in our + * sigchld_handler(), we succeed instead of returning an error. */ +pid_t wait_process(pid_t pid, int *status_ptr, int flags) { - pid_t waited_pid; - int cnt; - - while ((waited_pid = waitpid(pid, status, WNOHANG)) == 0) { - msleep(20); - io_flush(FULL_FLUSH); - } + pid_t waited_pid = waitpid(pid, status_ptr, flags); if (waited_pid == -1 && errno == ECHILD) { - /* status of requested child no longer available. - * check to see if it was processed by the sigchld_handler. - */ + /* Status of requested child no longer available: check to + * see if it was processed by sigchld_handler(). */ + int cnt; for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) { if (pid == pid_stat_table[cnt].pid) { - *status = pid_stat_table[cnt].status; + *status_ptr = pid_stat_table[cnt].status; pid_stat_table[cnt].pid = 0; - break; + return pid; } } } + return waited_pid; +} + +/* Wait for a process to exit, calling io_flush while waiting. */ +static void wait_process_with_flush(pid_t pid, int *code_ptr) +{ + pid_t waited_pid; + int status; + + while ((waited_pid = wait_process(pid, &status, WNOHANG)) == 0) { + msleep(20); + io_flush(FULL_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); + * this to the caller so that they know something went wrong. */ + if (waited_pid < 0) + *code_ptr = RERR_WAITCHILD; + else if (!WIFEXITED(status)) { +#ifdef WCOREDUMP + if (WCOREDUMP(status)) + *code_ptr = RERR_CRASHED; + else +#endif + if (WIFSIGNALED(status)) + *code_ptr = RERR_TERMINATED; + else + *code_ptr = RERR_WAITCHILD; + } else + *code_ptr = WEXITSTATUS(status); } /* This function gets called from all 3 processes. We want the client side @@ -163,7 +180,9 @@ static void handle_stats(int f) /* this is the client */ - if (!am_sender) { + if (f < 0 && !am_sender) /* e.g. when we got an empty file list. */ + ; + else if (!am_sender) { /* Read the first two in opposite order because the meaning of * read/write swaps when switching from sender to receiver. */ total_written = read_longint(f); @@ -173,7 +192,7 @@ static void handle_stats(int f) stats.flist_buildtime = read_longint(f); stats.flist_xfertime = read_longint(f); } - } else if (write_batch && !am_server) { + } else if (write_batch) { /* The --read-batch process is going to be a client * receiver, so we need to give it the stats. */ write_longint(batch_fd, total_read); @@ -184,7 +203,10 @@ static void handle_stats(int f) write_longint(batch_fd, stats.flist_xfertime); } } +} +static void output_summary(void) +{ if (do_stats) { rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files); rprintf(FINFO,"Number of files transferred: %d\n", @@ -212,12 +234,6 @@ static void handle_stats(int f) (double)total_read); } - fflush(stdout); - fflush(stderr); -} - -static void output_summary(void) -{ if (verbose || do_stats) { rprintf(FINFO, "\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n", @@ -294,7 +310,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) { /* Comparison leaves rooms for server_options(). */ - if (argc >= MAX_ARGS - 100) { + if (argc >= MAX_ARGS - MAX_SERVER_ARGS) { rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); exit_cleanup(RERR_SYNTAX); } @@ -466,7 +482,6 @@ static void read_final_goodbye(int f_in, int f_out) static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) { - int i; struct file_list *flist; char *dir = argv[0]; @@ -495,14 +510,6 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) argc--; argv++; - if (strcmp(dir,".")) { - int l = strlen(dir); - if (strcmp(dir,"/") == 0) - l = 0; - for (i = 0; i < argc; i++) - argv[i] += l+1; - } - if (argc == 0 && (recurse || list_only)) { argc = 1; argv--; @@ -617,7 +624,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) set_msg_fd_in(-1); kill(pid, SIGUSR2); - wait_process(pid, &status); + wait_process_with_flush(pid, &status); return status; } @@ -628,6 +635,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) struct file_list *flist; char *local_name = NULL; char *dir = NULL; + char olddir[sizeof curr_dir]; int save_verbose = verbose; if (filesfrom_fd >= 0) { @@ -672,6 +680,10 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) filesfrom_fd = -1; } + strlcpy(olddir, curr_dir, sizeof olddir); + if (always_checksum && argc > 0) + pre_checksum = push_dir(argv[0]); + flist = recv_file_list(f_in); verbose = save_verbose; if (!flist) { @@ -680,14 +692,11 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } the_file_list = flist; - if (argc > 0) { - if (strcmp(dir,".")) { - argv[0] += strlen(dir); - if (argv[0][0] == '/') - argv[0]++; - } + if (pre_checksum) + pop_dir(olddir); + + if (argc > 0) local_name = get_local_name(flist,argv[0]); - } status = do_recv(f_in,f_out,flist,local_name); exit_cleanup(status); @@ -734,6 +743,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) { struct file_list *flist = NULL; int status = 0, status2 = 0; + char olddir[sizeof curr_dir]; char *local_name = NULL; cleanup_child_pid = pid; @@ -785,7 +795,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (verbose > 3) rprintf(FINFO,"client_run waiting on %d\n", (int) pid); io_flush(FULL_FLUSH); - wait_process(pid, &status); + wait_process_with_flush(pid, &status); } output_summary(); io_flush(FULL_FLUSH); @@ -805,26 +815,32 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) filesfrom_fd = -1; } + strlcpy(olddir, curr_dir, sizeof olddir); + if (always_checksum) + pre_checksum = push_dir(argv[0]); + if (write_batch && !am_server) start_write_batch(f_in); flist = recv_file_list(f_in); - if (!flist || flist->count == 0) { - rprintf(FINFO, "client: nothing to do: " - "perhaps you need to specify some filenames or " - "the --recursive option?\n"); - exit_cleanup(0); - } the_file_list = flist; - local_name = get_local_name(flist,argv[0]); + if (pre_checksum) + pop_dir(olddir); - status2 = do_recv(f_in,f_out,flist,local_name); + if (flist && flist->count > 0) { + local_name = get_local_name(flist, argv[0]); + + status2 = do_recv(f_in, f_out, flist, local_name); + } else { + handle_stats(-1); + output_summary(); + } if (pid != -1) { if (verbose > 3) rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid); io_flush(FULL_FLUSH); - wait_process(pid, &status); + wait_process_with_flush(pid, &status); } return MAX(status, status2); @@ -874,6 +890,13 @@ static int start_client(int argc, char *argv[]) argc--; shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); if (shell_path) { /* source is remote */ + char *dummy1; + int dummy2; + if (argc && check_for_hostspec(argv[argc], &dummy1, &dummy2)) { + rprintf(FERROR, + "The source and destination cannot both be remote.\n"); + exit_cleanup(RERR_SYNTAX); + } argv++; if (filesfrom_host && *filesfrom_host && strcmp(filesfrom_host, shell_machine) != 0) { @@ -1006,8 +1029,7 @@ static RETSIGTYPE sigchld_handler(UNUSED(int val)) * 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. - */ + * 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++) { @@ -1019,6 +1041,7 @@ static RETSIGTYPE sigchld_handler(UNUSED(int val)) } } #endif + signal(SIGCHLD, sigchld_handler); }