X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/97d8e7095f191c38783a4e14d1bc502a49e8867a..acee11fc60cc685c1d6889f37d680f4ab214c93d:/main.c diff --git a/main.c b/main.c index a9418f7f..aa46f98a 100644 --- a/main.c +++ b/main.c @@ -45,7 +45,6 @@ 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 relative_paths; extern int rsync_port; @@ -61,19 +60,17 @@ extern char *filesfrom_host; 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, * but set it higher, just in case. */ -#define MAXCHILDPROCS 5 +#define MAXCHILDPROCS 7 struct pid_status { pid_t pid; - int status; + int status; } pid_stat_table[MAXCHILDPROCS]; static time_t starttime, endtime; @@ -91,7 +88,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags) /* 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++) { + for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) { if (pid == pid_stat_table[cnt].pid) { *status_ptr = pid_stat_table[cnt].status; pid_stat_table[cnt].pid = 0; @@ -104,7 +101,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags) } /* Wait for a process to exit, calling io_flush while waiting. */ -static void wait_process_with_flush(pid_t pid, int *code_ptr) +static void wait_process_with_flush(pid_t pid, int *exit_code_ptr) { pid_t waited_pid; int status; @@ -118,20 +115,21 @@ static void wait_process_with_flush(pid_t pid, int *code_ptr) * appropriate error message. Perhaps we should also accept a * message describing the purpose of the child. Also indicate * this to the caller so that they know something went wrong. */ - if (waited_pid < 0) - *code_ptr = RERR_WAITCHILD; - else if (!WIFEXITED(status)) { + if (waited_pid < 0) { + rsyserr(FERROR, errno, "waitpid"); + *exit_code_ptr = RERR_WAITCHILD; + } else if (!WIFEXITED(status)) { #ifdef WCOREDUMP if (WCOREDUMP(status)) - *code_ptr = RERR_CRASHED; + *exit_code_ptr = RERR_CRASHED; else #endif if (WIFSIGNALED(status)) - *code_ptr = RERR_TERMINATED; + *exit_code_ptr = RERR_TERMINATED; else - *code_ptr = RERR_WAITCHILD; + *exit_code_ptr = RERR_WAITCHILD; } else - *code_ptr = WEXITSTATUS(status); + *exit_code_ptr = WEXITSTATUS(status); } /* This function gets called from all 3 processes. We want the client side @@ -397,7 +395,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, return ret; -oom: + oom: out_of_memory("do_cmd"); return 0; /* not reached */ } @@ -538,7 +536,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) { int pid; - int status = 0; + int exit_code = 0; int error_pipe[2]; /* The receiving side mustn't obey this, or an existing symlink that @@ -624,18 +622,17 @@ 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_with_flush(pid, &status); - return status; + wait_process_with_flush(pid, &exit_code); + return exit_code; } static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) { - int status; + int exit_code; struct file_list *flist; char *local_name = NULL; char *dir = NULL; - char olddir[sizeof curr_dir]; int save_verbose = verbose; if (filesfrom_fd >= 0) { @@ -655,7 +652,6 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) return; } - if (argc > 0) { dir = argv[0]; argc--; @@ -680,10 +676,6 @@ 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) { @@ -692,14 +684,11 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } the_file_list = flist; - 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); + exit_code = do_recv(f_in,f_out,flist,local_name); + exit_cleanup(exit_code); } @@ -742,8 +731,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) 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]; + int exit_code = 0, exit_code2 = 0; char *local_name = NULL; cleanup_child_pid = pid; @@ -795,11 +783,11 @@ 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_with_flush(pid, &status); + wait_process_with_flush(pid, &exit_code); } output_summary(); io_flush(FULL_FLUSH); - exit_cleanup(status); + exit_cleanup(exit_code); } if (need_messages_from_generator && !read_batch) @@ -815,22 +803,15 @@ 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); the_file_list = flist; - if (pre_checksum) - pop_dir(olddir); - if (flist && flist->count > 0) { local_name = get_local_name(flist, argv[0]); - status2 = do_recv(f_in, f_out, flist, local_name); + exit_code2 = do_recv(f_in, f_out, flist, local_name); } else { handle_stats(-1); output_summary(); @@ -840,10 +821,10 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (verbose > 3) rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid); io_flush(FULL_FLUSH); - wait_process_with_flush(pid, &status); + wait_process_with_flush(pid, &exit_code); } - return MAX(status, status2); + return MAX(exit_code, exit_code2); } static int copy_argv (char *argv[])