X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4de2a1740983244221d66b22b983c36a174e3100..f2ae9e8583d289ed876c3666bd533dba13ffbfb8:/main.c diff --git a/main.c b/main.c index c4b8333a..f48febe8 100644 --- a/main.c +++ b/main.c @@ -33,8 +33,8 @@ extern int verbose; extern int blocking_io; extern int cvs_exclude; extern int delete_mode; +extern int delete_before; extern int delete_excluded; -extern int delete_after; extern int daemon_over_rsh; extern int do_stats; extern int dry_run; @@ -43,6 +43,7 @@ extern int local_server; extern int log_got_error; extern int module_id; extern int orig_umask; +extern int copy_links; extern int keep_dirlinks; extern int preserve_hard_links; extern int protocol_version; @@ -58,14 +59,15 @@ extern int filesfrom_fd; extern pid_t cleanup_child_pid; extern char *files_from; extern char *remote_filesfrom_file; +extern char *partial_dir; +extern char *basis_dir[]; extern char *rsync_path; extern char *shell_cmd; extern char *batch_name; +extern struct filter_list_struct filter_list; - -/* 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 { @@ -144,6 +146,10 @@ static void report(int f) write_longint(f, total_read); write_longint(f, total_written); write_longint(f, stats.total_size); + if (protocol_version >= 29) { + write_longint(f, stats.flist_buildtime); + write_longint(f, stats.flist_xfertime); + } } return; } @@ -156,12 +162,20 @@ static void report(int f) total_written = read_longint(f); total_read = read_longint(f); stats.total_size = read_longint(f); + if (protocol_version >= 29) { + stats.flist_buildtime = read_longint(f); + stats.flist_xfertime = read_longint(f); + } } 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); write_longint(batch_fd, total_written); write_longint(batch_fd, stats.total_size); + if (protocol_version >= 29) { + write_longint(batch_fd, stats.flist_buildtime); + write_longint(batch_fd, stats.flist_xfertime); + } } if (do_stats) { @@ -177,6 +191,14 @@ static void report(int f) rprintf(FINFO,"Matched data: %.0f bytes\n", (double)stats.matched_data); rprintf(FINFO,"File list size: %d\n", stats.flist_size); + if (stats.flist_buildtime) { + rprintf(FINFO, + "File list generation time: %.3f seconds\n", + (double)stats.flist_buildtime / 1000); + rprintf(FINFO, + "File list transfer time: %.3f seconds\n", + (double)stats.flist_xfertime / 1000); + } rprintf(FINFO,"Total bytes sent: %.0f\n", (double)total_written); rprintf(FINFO,"Total bytes received: %.0f\n", @@ -203,28 +225,36 @@ static void report(int f) **/ static void show_malloc_stats(void) { -#ifdef HAVE_MALLINFO +#if HAVE_MALLINFO struct mallinfo mi; 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 */ } @@ -378,9 +408,13 @@ static char *get_local_name(struct file_list *flist,char *name) if (do_mkdir(name,0777 & ~orig_umask) != 0) { rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name)); exit_cleanup(RERR_FILEIO); - } else { - if (verbose > 0) - rprintf(FINFO,"created directory %s\n",name); + } + if (verbose > 0) + rprintf(FINFO, "created directory %s\n", name); + + if (dry_run) { + dry_run++; + return NULL; } if (!push_dir(name)) { @@ -426,7 +460,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) argv[i] += l+1; } - if (argc == 0 && recurse) { + if (argc == 0 && (recurse || list_only)) { argc = 1; argv--; argv[0] = "."; @@ -456,26 +490,41 @@ 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]; + int error_pipe[2], name_pipe[2]; + BOOL need_name_pipe = (basis_dir[0] || partial_dir) && !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. */ + copy_links = 0; if (preserve_hard_links) init_hard_links(flist); - if (!delete_after) { - /* I moved this here from recv_files() to prevent a race condition */ - if (recurse && delete_mode && !local_name && flist->count > 0) - delete_files(flist); + if (delete_before && !local_name && flist->count > 0) { + /* Moved here from recv_files() to prevent a race condition */ + delete_files(flist); } - if (fd_pair(error_pipe) < 0) { - rprintf(FERROR,"error pipe failed in do_recv\n"); - exit_cleanup(RERR_SOCKETIO); + if (fd_pair(error_pipe) < 0 + || (need_name_pipe && fd_pair(name_pipe) < 0)) { + rsyserr(FERROR, errno, "pipe failed in do_recv"); + exit_cleanup(RERR_IPC); } io_flush(NORMAL_FLUSH); - if ((pid = do_fork()) == 0) { + if ((pid = do_fork()) == -1) { + rsyserr(FERROR, errno, "fork failed in do_recv"); + exit_cleanup(RERR_IPC); + } + + if (pid == 0) { close(error_pipe[0]); + if (need_name_pipe) { + close(name_pipe[1]); + set_blocking(name_pipe[0]); + } else + name_pipe[0] = -1; if (f_in != f_out) close(f_out); @@ -485,7 +534,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) /* set place to send errors */ set_msg_fd_out(error_pipe[1]); - recv_files(f_in,flist,local_name); + recv_files(f_in, flist, local_name, name_pipe[0]); io_flush(FULL_FLUSH); report(f_in); @@ -504,6 +553,11 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) stop_write_batch(); close(error_pipe[1]); + if (need_name_pipe) { + close(name_pipe[0]); + set_nonblocking(name_pipe[1]); + } else + name_pipe[1] = -1; if (f_in != f_out) close(f_in); @@ -511,9 +565,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) set_msg_fd_in(error_pipe[0]); - generate_files(f_out, flist, local_name); + generate_files(f_out, flist, local_name, name_pipe[1]); - get_redo_num(); /* Read final MSG_DONE and any prior messages. */ report(-1); io_flush(FULL_FLUSH); if (protocol_version >= 24) { @@ -535,6 +588,13 @@ 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; + int save_verbose = verbose; + + if (filesfrom_fd >= 0) { + /* We can't mix messages with files-from data on the socket, + * so temporarily turn off verbose messages. */ + verbose = 0; + } if (verbose > 2) { rprintf(FINFO, "server_recv(%d) starting pid=%ld\n", @@ -561,18 +621,22 @@ 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_exclude_list(f_in); + recv_filter_list(f_in); + if (cvs_exclude && protocol_version < 29) + add_filter(&filter_list, ":C", 0); if (filesfrom_fd >= 0) { - /* We're receiving the file info from the sender, so we need - * the IO routines to automatically write out the names onto - * our f_out socket as we read the list info from the sender. - * This avoids both deadlock and extra delays/buffers. */ + /* We need to send the files-from names to the sender at the + * same time that we receive the file-list from them, so we + * need the IO routines to automatically write out the names + * onto our f_out socket as we read the file-list. This + * avoids both deadlock and extra delays/buffers. */ io_set_filesfrom_fds(filesfrom_fd, f_out); filesfrom_fd = -1; } flist = recv_file_list(f_in); + verbose = save_verbose; if (!flist) { rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); @@ -613,7 +677,7 @@ 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. */ - recv_exclude_list(f_in); + recv_filter_list(f_in); if (cvs_exclude) add_cvs_excludes(); do_server_sender(f_in, f_out, argc, argv); @@ -635,9 +699,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) char *local_name = NULL; cleanup_child_pid = pid; - if (read_batch) { - assert(am_sender == 0); - } else { + if (!read_batch) { set_nonblocking(f_in); set_nonblocking(f_out); } @@ -648,13 +710,25 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (protocol_version >= 23 && !read_batch) io_start_multiplex_in(); + /* We set our stderr file handle to blocking because ssh might have + * set it to non-blocking. This can be particularly troublesome if + * stderr is a clone of stdout, because ssh would have set our stdout + * to non-blocking at the same time (which can easily cause us to lose + * output from our print statements). This kluge shouldn't cause ssh + * any problems for how we use it. Note also that we delayed setting + * this until after the above protocol setup so that we know for sure + * that ssh is done twiddling its file descriptors. */ + set_blocking(STDERR_FILENO); + if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ 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_exclude_list(f_out); + send_filter_list(f_out); if (remote_filesfrom_file) filesfrom_fd = f_in; @@ -662,6 +736,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) start_write_batch(f_out); if (!read_batch) /* don't write to pipe */ flist = send_file_list(f_out,argc,argv); + set_msg_fd_in(-1); if (verbose > 3) rprintf(FINFO,"file list sent\n"); @@ -684,10 +759,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) } if (argc == 0) - list_only = 1; + list_only |= 1; if (!read_batch) - send_exclude_list(f_out); + send_filter_list(f_out); + if (cvs_exclude) + add_cvs_excludes(); if (filesfrom_fd >= 0) { io_set_filesfrom_fds(filesfrom_fd, f_out); @@ -766,15 +843,20 @@ static int start_client(int argc, char *argv[]) host = argv[0] + strlen(URL_PREFIX); p = strchr(host,'/'); if (p) { - *p = 0; + *p = '\0'; path = p+1; - } else { + } else path = ""; - } - p = strchr(host,':'); + if (*host == '[' && (p = strchr(host, ']')) != NULL) { + host++; + *p++ = '\0'; + if (*p != ':') + p = NULL; + } else + p = strchr(host, ':'); if (p) { rsync_port = atoi(p+1); - *p = 0; + *p = '\0'; } return start_socket_client(host, path, argc-1, argv+1); } @@ -786,7 +868,7 @@ static int start_client(int argc, char *argv[]) && remote_filesfrom_file != files_from + 1 && strncmp(files_from, argv[0], p-argv[0]+1) != 0) { rprintf(FERROR, - "--files-from hostname is not transfer hostname\n"); + "--files-from hostname is not the same as the transfer hostname\n"); exit_cleanup(RERR_SYNTAX); } if (p[1] == ':') { /* double colon */ @@ -819,15 +901,20 @@ static int start_client(int argc, char *argv[]) host = argv[argc-1] + strlen(URL_PREFIX); p = strchr(host,'/'); if (p) { - *p = 0; + *p = '\0'; path = p+1; - } else { + } else path = ""; - } - p = strchr(host,':'); + if (*host == '[' && (p = strchr(host, ']')) != NULL) { + host++; + *p++ = '\0'; + if (*p != ':') + p = NULL; + } else + p = strchr(host, ':'); if (p) { rsync_port = atoi(p+1); - *p = 0; + *p = '\0'; } return start_socket_client(host, path, argc-1, argv); } @@ -837,14 +924,14 @@ static int start_client(int argc, char *argv[]) && remote_filesfrom_file != files_from + 1 && strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) { rprintf(FERROR, - "--files-from hostname is not transfer hostname\n"); + "--files-from hostname is not the same as the transfer hostname\n"); exit_cleanup(RERR_SYNTAX); } if (!p) { /* no colon found, so src & dest are local */ local_server = 1; if (remote_filesfrom_file) { rprintf(FERROR, - "--files-from is remote but transfer is local\n"); + "--files-from cannot be remote when the transfer is local\n"); exit_cleanup(RERR_SYNTAX); } } else if (p[1] == ':') { /* double colon */ @@ -905,9 +992,8 @@ static int start_client(int argc, char *argv[]) } /* ... or no dest at all */ - if (!am_sender && argc == 0) { - list_only = 1; - } + if (!am_sender && argc == 0) + list_only |= 1; pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path, &f_in,&f_out);