X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f0f7e760ae03896c9856b2f389acf97c20aa67d1..8ebdc9724efd6a4f3aeaf6287f5dc7c4762969b8:/main.c diff --git a/main.c b/main.c index 545c8940..3a0a3550 100644 --- a/main.c +++ b/main.c @@ -23,24 +23,20 @@ time_t starttime = 0; -extern struct stats stats; +extern int verbose; +extern int dry_run; +extern int list_only; extern int am_root; extern int am_server; extern int am_sender; extern int am_generator; extern int am_daemon; -extern int verbose; extern int blocking_io; -extern int cvs_exclude; -extern int delete_mode; -extern int delete_before; -extern int delete_after; -extern int delete_excluded; +extern int remove_sent_files; extern int daemon_over_rsh; +extern int need_messages_from_generator; +extern int kluge_around_eof; extern int do_stats; -extern int dry_run; -extern int list_only; -extern int local_server; extern int log_got_error; extern int module_id; extern int orig_umask; @@ -49,8 +45,11 @@ extern int keep_dirlinks; extern int preserve_hard_links; extern int protocol_version; 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; @@ -58,6 +57,7 @@ extern int batch_fd; extern int batch_gen_fd; extern int filesfrom_fd; extern pid_t cleanup_child_pid; +extern struct stats stats; extern char *files_from; extern char *remote_filesfrom_file; extern char *partial_dir; @@ -66,10 +66,10 @@ extern char *rsync_path; extern char *shell_cmd; extern char *batch_name; +int local_server = 0; -/* there's probably never more than at most 2 outstanding child processes, - * but set it higher just in case. - */ +/* 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 { @@ -233,22 +233,30 @@ static void show_malloc_stats(void) mi = mallinfo(); rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n", - getpid(), - am_server ? "server " : "", - am_daemon ? "daemon " : "", - who_am_i()); - rprintf(FINFO, " arena: %10d (bytes from sbrk)\n", mi.arena); - rprintf(FINFO, " ordblks: %10d (chunks not in use)\n", mi.ordblks); - rprintf(FINFO, " smblks: %10d\n", mi.smblks); - rprintf(FINFO, " hblks: %10d (chunks from mmap)\n", mi.hblks); - rprintf(FINFO, " hblkhd: %10d (bytes from mmap)\n", mi.hblkhd); - rprintf(FINFO, " allmem: %10d (bytes from sbrk + mmap)\n", - mi.arena + mi.hblkhd); - rprintf(FINFO, " usmblks: %10d\n", mi.usmblks); - rprintf(FINFO, " fsmblks: %10d\n", mi.fsmblks); - rprintf(FINFO, " uordblks: %10d (bytes used)\n", mi.uordblks); - rprintf(FINFO, " fordblks: %10d (bytes free)\n", mi.fordblks); - rprintf(FINFO, " keepcost: %10d (bytes in releasable chunk)\n", mi.keepcost); + getpid(), am_server ? "server " : "", + am_daemon ? "daemon " : "", who_am_i()); + rprintf(FINFO, " arena: %10ld (bytes from sbrk)\n", + (long)mi.arena); + rprintf(FINFO, " ordblks: %10ld (chunks not in use)\n", + (long)mi.ordblks); + rprintf(FINFO, " smblks: %10ld\n", + (long)mi.smblks); + rprintf(FINFO, " hblks: %10ld (chunks from mmap)\n", + (long)mi.hblks); + rprintf(FINFO, " hblkhd: %10ld (bytes from mmap)\n", + (long)mi.hblkhd); + rprintf(FINFO, " allmem: %10ld (bytes from sbrk + mmap)\n", + (long)mi.arena + mi.hblkhd); + rprintf(FINFO, " usmblks: %10ld\n", + (long)mi.usmblks); + rprintf(FINFO, " fsmblks: %10ld\n", + (long)mi.fsmblks); + rprintf(FINFO, " uordblks: %10ld (bytes used)\n", + (long)mi.uordblks); + rprintf(FINFO, " fordblks: %10ld (bytes free)\n", + (long)mi.fordblks); + rprintf(FINFO, " keepcost: %10ld (bytes in releasable chunk)\n", + (long)mi.keepcost); #endif /* HAVE_MALLINFO */ } @@ -289,7 +297,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, dash_l_set = 1; } -#if HAVE_REMSH +#ifdef HAVE_REMSH /* remsh (on HPUX) takes the arguments the other way around */ args[argc++] = machine; if (user && !(daemon_over_rsh && dash_l_set)) { @@ -334,7 +342,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, if (verbose > 3) { rprintf(FINFO,"cmd="); for (i = 0; i < argc; i++) - rprintf(FINFO,"%s ",args[i]); + rprintf(FINFO, "%s ", safe_fname(args[i])); rprintf(FINFO,"\n"); } @@ -404,7 +412,7 @@ static char *get_local_name(struct file_list *flist,char *name) exit_cleanup(RERR_FILEIO); } if (verbose > 0) - rprintf(FINFO, "created directory %s\n", name); + rprintf(FINFO, "created directory %s\n", safe_fname(name)); if (dry_run) { dry_run++; @@ -421,6 +429,29 @@ static char *get_local_name(struct file_list *flist,char *name) } +/* This is only called by the sender. */ +static void read_final_goodbye(int f_in, int f_out, int flist_count) +{ + int i; + + if (protocol_version < 29) + i = read_int(f_in); + else { + while ((i = read_int(f_in)) == flist_count + && read_shortint(f_in) == ITEM_IS_NEW) { + /* Forward the keep-alive (no-op) to the receiver. */ + write_int(f_out, flist_count); + write_shortint(f_out, ITEM_IS_NEW); + } + } + + if (i != -1) { + rprintf(FERROR, "Invalid packet from generator at end of run.\n"); + exit_cleanup(RERR_PROTOCOL); + } +} + + static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) { int i; @@ -437,6 +468,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) exit_cleanup(RERR_SYNTAX); return; } + if (am_daemon && lp_read_only(module_id) && remove_sent_files) { + rprintf(FERROR, + "ERROR: --remove-sent-files cannot be used with a read-only module\n"); + exit_cleanup(RERR_SYNTAX); + return; + } if (!relative_paths && !push_dir(dir)) { rsyserr(FERROR, errno, "push_dir#3 %s failed", @@ -471,10 +508,8 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) send_files(flist,f_out,f_in); io_flush(FULL_FLUSH); report(f_out); - if (protocol_version >= 24) { - /* final goodbye message */ - read_int(f_in); - } + if (protocol_version >= 24) + read_final_goodbye(f_in, f_out, flist->count); io_flush(FULL_FLUSH); exit_cleanup(0); } @@ -485,7 +520,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) int pid; int status = 0; int error_pipe[2], name_pipe[2]; - BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !dry_run; + BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis + || (inplace && make_backups)) && !dry_run; /* The receiving side mustn't obey this, or an existing symlink that * points to an identical file won't be replaced by the referent. */ @@ -494,12 +530,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) if (preserve_hard_links) init_hard_links(flist); - if (delete_before) { - /* I moved this here from recv_files() to prevent a race condition */ - if (recurse && !local_name && flist->count > 0) - delete_files(flist); - } - if (fd_pair(error_pipe) < 0 || (need_name_pipe && fd_pair(name_pipe) < 0)) { rsyserr(FERROR, errno, "pipe failed in do_recv"); @@ -535,9 +565,23 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) send_msg(MSG_DONE, "", 0); io_flush(FULL_FLUSH); - /* finally we go to sleep until our parent kills us - * with a USR2 signal. We sleep for a short time as on - * some OSes a signal won't interrupt a sleep! */ + + /* Handle any keep-alive packets from the post-processing work + * that the generator does. */ + if (protocol_version >= 29) { + kluge_around_eof = -1; + + /* This should only get stopped via a USR2 signal. */ + while (read_int(f_in) == flist->count + && read_shortint(f_in) == ITEM_IS_NEW) {} + + rprintf(FERROR, "Invalid packet from server at end of run.\n"); + exit_cleanup(RERR_PROTOCOL); + } + + /* Finally, we go to sleep until our parent kills us with a + * USR2 signal. We sleep for a short time, as on some OSes + * a signal won't interrupt a sleep! */ while (1) msleep(20); } @@ -615,10 +659,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } io_start_buffering_in(); - if (delete_mode && !delete_excluded) - recv_filter_list(f_in); - if (cvs_exclude) - add_cvs_excludes(); + recv_filter_list(f_in); if (filesfrom_fd >= 0) { /* We need to send the files-from names to the sender at the @@ -671,10 +712,10 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ + if (need_messages_from_generator) + io_start_multiplex_in(); recv_filter_list(f_in); - if (cvs_exclude) - add_cvs_excludes(); do_server_sender(f_in, f_out, argc, argv); } else { do_server_recv(f_in, f_out, argc, argv); @@ -720,10 +761,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) io_start_buffering_out(); if (!remote_filesfrom_file) set_msg_fd_in(f_in); - if (cvs_exclude) - add_cvs_excludes(); - if (delete_mode && !delete_excluded) - send_filter_list(f_out); + send_filter_list(f_out); if (remote_filesfrom_file) filesfrom_fd = f_in; @@ -738,10 +776,8 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) io_flush(NORMAL_FLUSH); send_files(flist,f_out,f_in); io_flush(FULL_FLUSH); - if (protocol_version >= 24) { - /* final goodbye message */ - read_int(f_in); - } + if (protocol_version >= 24) + read_final_goodbye(f_in, f_out, flist->count); if (pid != -1) { if (verbose > 3) rprintf(FINFO,"client_run waiting on %d\n", (int) pid); @@ -753,13 +789,13 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) exit_cleanup(status); } + if (need_messages_from_generator && !read_batch) + io_start_multiplex_out(); + if (argc == 0) list_only |= 1; - if (!read_batch) - send_filter_list(f_out); - if (cvs_exclude) - add_cvs_excludes(); + send_filter_list(read_batch ? -1 : f_out); if (filesfrom_fd >= 0) { io_set_filesfrom_fds(filesfrom_fd, f_out); @@ -974,10 +1010,10 @@ static int start_client(int argc, char *argv[]) if (verbose > 3) { rprintf(FINFO,"cmd=%s machine=%s user=%s path=%s\n", - shell_cmd?shell_cmd:"", - shell_machine?shell_machine:"", - shell_user?shell_user:"", - shell_path?shell_path:""); + shell_cmd ? safe_fname(shell_cmd) : "", + shell_machine ? safe_fname(shell_machine) : "", + shell_user ? safe_fname(shell_user) : "", + shell_path ? safe_fname(shell_path) : ""); } /* for remote source, only single dest arg can remain ... */ @@ -1019,6 +1055,7 @@ static RETSIGTYPE sigusr1_handler(UNUSED(int val)) static RETSIGTYPE sigusr2_handler(UNUSED(int val)) { + close_all(); if (log_got_error) _exit(RERR_PARTIAL); _exit(0); } @@ -1165,7 +1202,7 @@ int main(int argc,char *argv[]) } if (batch_fd < 0) { rsyserr(FERROR, errno, "Batch file %s open error", - batch_name); + full_fname(batch_name)); exit_cleanup(RERR_FILEIO); } if (read_batch) @@ -1180,9 +1217,6 @@ int main(int argc,char *argv[]) exit_cleanup(RERR_SYNTAX); } - if (dry_run) - verbose = MAX(verbose,1); - if (am_server) { set_nonblocking(STDIN_FILENO); set_nonblocking(STDOUT_FILENO);