X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9af87151ece30ad4b78571cd7f22eadb58e562fe..25ff04417e4b4fa0aeb44e0b1576a01021aa1650:/main.c diff --git a/main.c b/main.c index a7cf981a..8ba45a26 100644 --- a/main.c +++ b/main.c @@ -24,14 +24,48 @@ time_t starttime = 0; extern struct stats stats; -extern char *files_from; -extern int filesfrom_fd; -extern char *remote_filesfrom_file; +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 daemon_over_rsh; +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; +extern int copy_links; +extern int keep_dirlinks; +extern int preserve_hard_links; extern int protocol_version; +extern int recurse; +extern int relative_paths; +extern int rsync_port; +extern int whole_file; +extern int read_batch; +extern int write_batch; +extern int batch_fd; +extern int batch_gen_fd; +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; + /* there's probably never more than at most 2 outstanding child processes, * but set it higher just in case. @@ -55,10 +89,10 @@ void wait_process(pid_t pid, int *status) while ((waited_pid = waitpid(pid, status, WNOHANG)) == 0) { msleep(20); - io_flush(); + io_flush(FULL_FLUSH); } - if ((waited_pid == -1) && (errno == ECHILD)) { + if (waited_pid == -1 && errno == ECHILD) { /* status of requested child no longer available. * check to see if it was processed by the sigchld_handler. */ @@ -79,11 +113,20 @@ void wait_process(pid_t pid, int *status) *status = WEXITSTATUS(*status); } +/* This function gets called from all 3 processes. We want the client side + * to actually output the text, but the sender is the only process that has + * all the stats we need. So, if we're a client sender, we do the report. + * If we're a server sender, we write the stats on the supplied fd. If + * we're the client receiver we read the stats from the supplied fd and do + * the report. All processes might also generate a set of debug stats, if + * the verbose level is high enough (this is the only thing that the + * generator process and the server receiver ever do here). */ static void report(int f) { + /* Cache two stats because the read/write code can change it. */ + int64 total_read = stats.total_read; + int64 total_written = stats.total_written; time_t t = time(NULL); - extern int do_stats; - int send_stats; if (do_stats && verbose > 1) { /* These come out from every process */ @@ -91,43 +134,53 @@ static void report(int f) show_flist_stats(); } + if (am_generator) + return; + if (am_daemon) { log_exit(0, __FILE__, __LINE__); - if (f == -1 || !am_sender) return; + if (f == -1 || !am_sender) + return; } - send_stats = verbose || protocol_version >= 20; if (am_server) { - if (am_sender && send_stats) { - int64 w; - /* store total_written in a temporary - * because write_longint changes it */ - w = stats.total_written; - write_longint(f,stats.total_read); - write_longint(f,w); - write_longint(f,stats.total_size); + if (am_sender) { + 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; } /* this is the client */ - if (!am_sender && send_stats) { - int64 r; - stats.total_written = read_longint(f); - /* store total_read in a temporary, read_longint changes it */ - r = read_longint(f); + 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); + total_read = read_longint(f); stats.total_size = read_longint(f); - stats.total_read = r; + 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) { - if (!am_sender && !send_stats) { - /* missing the bytes written by the generator */ - rprintf(FINFO, "\nCannot show stats as receiver because remote protocol version is less than 20\n"); - rprintf(FINFO, "Use --stats -v to show stats\n"); - return; - } rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files); rprintf(FINFO,"Number of files transferred: %d\n", stats.num_transferred_files); @@ -140,20 +193,28 @@ 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); - rprintf(FINFO,"Total bytes written: %.0f\n", - (double)stats.total_written); - rprintf(FINFO,"Total bytes read: %.0f\n", - (double)stats.total_read); + 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", + (double)total_read); } if (verbose || do_stats) { - rprintf(FINFO,"\nwrote %.0f bytes read %.0f bytes %.2f bytes/sec\n", - (double)stats.total_written, - (double)stats.total_read, - (stats.total_written+stats.total_read)/(0.5 + (t-starttime))); - rprintf(FINFO,"total size is %.0f speedup is %.2f\n", + rprintf(FINFO, + "\nsent %.0f bytes received %.0f bytes %.2f bytes/sec\n", + (double)total_written, (double)total_read, + (total_written + total_read)/(0.5 + (t - starttime))); + rprintf(FINFO, "total size is %.0f speedup is %.2f\n", (double)stats.total_size, - (1.0*stats.total_size)/(stats.total_written+stats.total_read)); + (double)stats.total_size / (total_written+total_read)); } fflush(stdout); @@ -166,21 +227,23 @@ static void report(int f) **/ static void show_malloc_stats(void) { -#ifdef HAVE_MALLINFO +#if HAVE_MALLINFO struct mallinfo mi; mi = mallinfo(); - rprintf(FINFO, RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n", + rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n", getpid(), am_server ? "server " : "", am_daemon ? "daemon " : "", - am_sender ? "sender" : "receiver"); + 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); @@ -191,18 +254,14 @@ static void show_malloc_stats(void) /* Start the remote shell. cmd may be NULL to use the default. */ -static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out) +static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, + int *f_in, int *f_out) { - char *args[100]; - int i,argc=0; + int i, argc = 0; + char *args[MAX_ARGS]; pid_t ret; - char *tok,*dir=NULL; + 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) { char *rsh_env = getenv(RSYNC_RSH_ENV); @@ -214,7 +273,12 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int if (!cmd) goto oom; - for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) { + for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) { + /* Comparison leaves rooms for server_options(). */ + if (argc >= MAX_ARGS - 100) { + rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); + exit_cleanup(RERR_SYNTAX); + } args[argc++] = tok; } @@ -243,20 +307,21 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int args[argc++] = rsync_path; if (blocking_io < 0) { - char *cp = getenv(RSYNC_RSH_IO_ENV); - if (rsh_env && cp && strcmp(cmd, rsh_env) == 0) - blocking_io = *cp == 'b' || *cp == 'B'; - else { - if ((cp = strrchr(cmd, '/')) != NULL) - cp++; - else - cp = cmd; - if (strcmp(cp, "rsh") == 0 || strcmp(cp, "remsh") == 0) - blocking_io = 1; - } + char *cp; + if ((cp = strrchr(cmd, '/')) != NULL) + cp++; + else + cp = cmd; + if (strcmp(cp, "rsh") == 0 || strcmp(cp, "remsh") == 0) + blocking_io = 1; } server_options(args,&argc); + + if (argc >= MAX_ARGS - 2) { + rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); + exit_cleanup(RERR_SYNTAX); + } } args[argc++] = "."; @@ -268,20 +333,32 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int if (verbose > 3) { rprintf(FINFO,"cmd="); - for (i=0;i 2) rprintf(FINFO,"get_local_name count=%d %s\n", @@ -308,9 +382,9 @@ static char *get_local_name(struct file_list *flist,char *name) if (do_stat(name,&st) == 0) { if (S_ISDIR(st.st_mode)) { - if (!push_dir(name, 0)) { - rprintf(FERROR, "push_dir %s failed: %s (1)\n", - full_fname(name), strerror(errno)); + if (!push_dir(name)) { + rsyserr(FERROR, errno, "push_dir#1 %s failed", + full_fname(name)); exit_cleanup(RERR_FILESELECT); } return NULL; @@ -326,17 +400,20 @@ static char *get_local_name(struct file_list *flist,char *name) return name; if (do_mkdir(name,0777 & ~orig_umask) != 0) { - rprintf(FERROR, "mkdir %s failed: %s\n", - full_fname(name), strerror(errno)); + 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, 0)) { - rprintf(FERROR, "push_dir %s failed: %s (2)\n", - full_fname(name), strerror(errno)); + if (!push_dir(name)) { + rsyserr(FERROR, errno, "push_dir#2 %s failed", + full_fname(name)); exit_cleanup(RERR_FILESELECT); } @@ -344,22 +421,26 @@ static char *get_local_name(struct file_list *flist,char *name) } - - 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]; - extern int relative_paths; - extern int recurse; - if (verbose > 2) - rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid()); + if (verbose > 2) { + rprintf(FINFO, "server_sender starting pid=%ld\n", + (long)getpid()); + } - if (!relative_paths && !push_dir(dir, 0)) { - rprintf(FERROR, "push_dir %s failed: %s (3)\n", - full_fname(dir), strerror(errno)); + if (am_daemon && lp_write_only(module_id)) { + rprintf(FERROR, "ERROR: module is write only\n"); + exit_cleanup(RERR_SYNTAX); + return; + } + + if (!relative_paths && !push_dir(dir)) { + rsyserr(FERROR, errno, "push_dir#3 %s failed", + full_fname(dir)); exit_cleanup(RERR_FILESELECT); } argc--; @@ -369,12 +450,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[]) int l = strlen(dir); if (strcmp(dir,"/") == 0) l = 0; - for (i=0;i= 24) { /* final goodbye message */ - read_int(f_in); - } - io_flush(); + read_int(f_in); + } + io_flush(FULL_FLUSH); exit_cleanup(0); } @@ -399,80 +483,94 @@ 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 recv_pipe[2]; - int error_pipe[2]; - extern int preserve_hard_links; - extern int delete_after; - extern int recurse; - extern int delete_mode; + int status = 0; + 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) { + if (delete_before) { /* I moved this here from recv_files() to prevent a race condition */ - if (recurse && delete_mode && !local_name && flist->count>0) { + if (recurse && !local_name && flist->count > 0) delete_files(flist); - } } - if (fd_pair(recv_pipe) < 0) { - rprintf(FERROR,"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); } - if (fd_pair(error_pipe) < 0) { - rprintf(FERROR,"error pipe failed in do_recv\n"); - exit_cleanup(RERR_SOCKETIO); - } + io_flush(NORMAL_FLUSH); - io_flush(); + if ((pid = do_fork()) == -1) { + rsyserr(FERROR, errno, "fork failed in do_recv"); + exit_cleanup(RERR_IPC); + } - if ((pid=do_fork()) == 0) { - close(recv_pipe[0]); + if (pid == 0) { close(error_pipe[0]); - if (f_in != f_out) close(f_out); + 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); /* we can't let two processes write to the socket at one time */ - io_multiplexing_close(); + close_multiplexing_out(); /* set place to send errors */ - set_error_fd(error_pipe[1]); + set_msg_fd_out(error_pipe[1]); - recv_files(f_in,flist,local_name,recv_pipe[1]); - io_flush(); + recv_files(f_in, flist, local_name, name_pipe[0]); + io_flush(FULL_FLUSH); report(f_in); - write_int(recv_pipe[1],1); - close(recv_pipe[1]); - io_flush(); + 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! */ - while (msleep(20)) - ; + while (1) + msleep(20); } - close(recv_pipe[1]); + am_generator = 1; + close_multiplexing_in(); + if (write_batch) + stop_write_batch(); + close(error_pipe[1]); - if (f_in != f_out) close(f_in); + 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); - io_start_buffering(f_out); + io_start_buffering_out(); - io_set_error_fd(error_pipe[0]); + set_msg_fd_in(error_pipe[0]); - generate_files(f_out,flist,local_name,recv_pipe[0]); + generate_files(f_out, flist, local_name, name_pipe[1]); - read_int(recv_pipe[0]); - close(recv_pipe[0]); + report(-1); + io_flush(FULL_FLUSH); if (protocol_version >= 24) { /* send a final goodbye message */ write_int(f_out, -1); } - io_flush(); + io_flush(FULL_FLUSH); - io_set_error_fd(-1); + set_msg_fd_in(-1); kill(pid, SIGUSR2); wait_process(pid, &status); return status; @@ -483,18 +581,22 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) { int status; struct file_list *flist; - char *local_name=NULL; + char *local_name = NULL; char *dir = NULL; - extern int delete_mode; - extern int delete_excluded; - extern int module_id; - extern int read_batch; - extern struct file_list *batch_flist; + int save_verbose = verbose; - if (verbose > 2) - rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid()); + 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", + argc, (long)getpid()); + } - if (am_daemon && lp_read_only(module_id) && !am_sender) { + if (am_daemon && lp_read_only(module_id)) { rprintf(FERROR,"ERROR: module is read only\n"); exit_cleanup(RERR_SYNTAX); return; @@ -505,29 +607,31 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) dir = argv[0]; argc--; argv++; - if (!am_daemon && !push_dir(dir, 0)) { - rprintf(FERROR, "push_dir %s failed: %s (4)\n", - full_fname(dir), strerror(errno)); + if (!am_daemon && !push_dir(dir)) { + rsyserr(FERROR, errno, "push_dir#4 %s failed", + full_fname(dir)); exit_cleanup(RERR_FILESELECT); } } + io_start_buffering_in(); if (delete_mode && !delete_excluded) - recv_exclude_list(f_in); + recv_filter_list(f_in); + if (cvs_exclude) + add_cvs_excludes(); 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; } - if (read_batch) - flist = batch_flist; - else - flist = recv_file_list(f_in); + flist = recv_file_list(f_in); + verbose = save_verbose; if (!flist) { rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); @@ -536,7 +640,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) if (argc > 0) { if (strcmp(dir,".")) { argv[0] += strlen(dir); - if (argv[0][0] == '/') argv[0]++; + if (argv[0][0] == '/') + argv[0]++; } local_name = get_local_name(flist,argv[0]); } @@ -555,23 +660,21 @@ int child_main(int argc, char *argv[]) void start_server(int f_in, int f_out, int argc, char *argv[]) { - extern int cvs_exclude; - extern int read_batch; - - setup_protocol(f_out, f_in); - set_nonblocking(f_in); set_nonblocking(f_out); + io_set_sock_fds(f_in, f_out); + setup_protocol(f_out, f_in); + if (protocol_version >= 23) - io_start_multiplex_out(f_out); + io_start_multiplex_out(); if (am_sender) { - if (!read_batch) { - recv_exclude_list(f_in); - if (cvs_exclude) - add_cvs_excludes(); - } + keep_dirlinks = 0; /* Must be disabled on the sender. */ + + 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); @@ -589,39 +692,52 @@ 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 *local_name = NULL; - extern pid_t cleanup_child_pid; - extern int write_batch; - extern int read_batch; - extern struct file_list *batch_flist; cleanup_child_pid = pid; - if (read_batch) - flist = batch_flist; - - set_nonblocking(f_in); - set_nonblocking(f_out); + if (!read_batch) { + set_nonblocking(f_in); + set_nonblocking(f_out); + } + io_set_sock_fds(f_in, f_out); setup_protocol(f_out,f_in); - if (protocol_version >= 23) - io_start_multiplex_in(f_in); + 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) { - extern int cvs_exclude; - extern int delete_mode; - extern int delete_excluded; + 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; - if (!read_batch) /* dw -- don't write to pipe */ + + if (write_batch) + 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"); + 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); @@ -629,26 +745,29 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (pid != -1) { if (verbose > 3) rprintf(FINFO,"client_run waiting on %d\n", (int) pid); - io_flush(); + io_flush(FULL_FLUSH); wait_process(pid, &status); } report(-1); + io_flush(FULL_FLUSH); exit_cleanup(status); } - if (argc == 0) { - extern int list_only; - list_only = 1; - } + if (argc == 0) + list_only |= 1; - if (!write_batch) - send_exclude_list(f_out); + if (!read_batch) + send_filter_list(f_out); + if (cvs_exclude) + add_cvs_excludes(); if (filesfrom_fd >= 0) { io_set_filesfrom_fds(filesfrom_fd, f_out); filesfrom_fd = -1; } + if (write_batch) + start_write_batch(f_in); flist = recv_file_list(f_in); if (!flist || flist->count == 0) { rprintf(FINFO, "client: nothing to do: " @@ -664,7 +783,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (pid != -1) { if (verbose > 3) rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid); - io_flush(); + io_flush(FULL_FLUSH); wait_process(pid, &status); } @@ -704,11 +823,6 @@ static int start_client(int argc, char *argv[]) int ret; pid_t pid; int f_in,f_out; - extern int local_server; - 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 @@ -717,33 +831,39 @@ static int start_client(int argc, char *argv[]) return rc; /* rsync:// always uses rsync server over direct socket connection */ - if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { + if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0 + && !read_batch) { char *host, *path; 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); } - if (!read_batch) { + if (!read_batch) { /* for read_batch, NO source is specified */ p = find_colon(argv[0]); - if (p) { + if (p) { /* source is remote */ if (remote_filesfrom_file && 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 */ @@ -756,7 +876,7 @@ static int start_client(int argc, char *argv[]) daemon_over_rsh = 1; } - if (argc < 1) { + if (argc < 1) { /* destination required */ usage(FERROR); exit_cleanup(RERR_SYNTAX); } @@ -765,9 +885,8 @@ static int start_client(int argc, char *argv[]) *p = 0; shell_machine = argv[0]; shell_path = p+1; - argc--; argv++; - } else { + } else { /* source is local */ am_sender = 1; /* rsync:// destination uses rsync server over direct socket */ @@ -777,32 +896,37 @@ 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); } - p = find_colon(argv[argc-1]); + p = find_colon(argv[argc-1]); /* look in dest arg */ if (p && remote_filesfrom_file && 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) { + 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 */ @@ -828,16 +952,19 @@ static int start_client(int argc, char *argv[]) shell_machine = argv[argc-1]; shell_path = p+1; } - argc--; } - } else { - am_sender = 1; + argc--; + } else { /* read_batch */ local_server = 1; shell_path = argv[argc-1]; + if (find_colon(shell_path)) { + rprintf(FERROR, "remote destination is not allowed with --read-batch\n"); + exit_cleanup(RERR_SYNTAX); + } } if (shell_machine) { - p = strchr(shell_machine,'@'); + p = strrchr(shell_machine,'@'); if (p) { *p = 0; shell_user = shell_machine; @@ -853,15 +980,15 @@ static int start_client(int argc, char *argv[]) shell_path?shell_path:""); } + /* for remote source, only single dest arg can remain ... */ if (!am_sender && argc > 1) { usage(FERROR); exit_cleanup(RERR_SYNTAX); } - if (argc == 0 && !am_sender) { - extern int list_only; - list_only = 1; - } + /* ... or no dest at all */ + if (!am_sender && argc == 0) + list_only |= 1; pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path, &f_in,&f_out); @@ -892,7 +1019,6 @@ static RETSIGTYPE sigusr1_handler(UNUSED(int val)) static RETSIGTYPE sigusr2_handler(UNUSED(int val)) { - extern int log_got_error; if (log_got_error) _exit(RERR_PARTIAL); _exit(0); } @@ -975,16 +1101,9 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig)) int main(int argc,char *argv[]) { - extern int am_root; - extern int orig_umask; - extern int dry_run; int ret; - extern int write_batch; - int orig_argc; - char **orig_argv; - - orig_argc = argc; - orig_argv = argv; + int orig_argc = argc; + char **orig_argv = argv; signal(SIGUSR1, sigusr1_handler); signal(SIGUSR2, sigusr2_handler); @@ -997,7 +1116,7 @@ int main(int argc,char *argv[]) #endif /* def MAINTAINER_MODE */ starttime = time(NULL); - am_root = (getuid() == 0); + am_root = (MY_UID() == 0); memset(&stats, 0, sizeof(stats)); @@ -1029,10 +1148,28 @@ int main(int argc,char *argv[]) * (implemented by forking "pwd" and reading its output) doesn't * work when there are other child processes. Also, on all systems * that implement getcwd that way "pwd" can't be found after chroot. */ - push_dir(NULL,0); + push_dir(NULL); - if (write_batch && !am_server) { - write_batch_argvs_file(orig_argc, orig_argv); + init_flist(); + + if (write_batch || read_batch) { + if (write_batch) + write_batch_shell_file(orig_argc, orig_argv, argc); + + if (read_batch && strcmp(batch_name, "-") == 0) + batch_fd = STDIN_FILENO; + else { + batch_fd = do_open(batch_name, + write_batch ? O_WRONLY | O_CREAT | O_TRUNC + : O_RDONLY, S_IRUSR | S_IWUSR); + } + if (batch_fd < 0) { + rsyserr(FERROR, errno, "Batch file %s open error", + batch_name); + exit_cleanup(RERR_FILEIO); + } + if (read_batch) + read_stream_flags(batch_fd); } if (am_daemon && !am_server) @@ -1046,13 +1183,6 @@ int main(int argc,char *argv[]) if (dry_run) verbose = MAX(verbose,1); -#ifndef SUPPORT_LINKS - if (!am_server && preserve_links) { - rprintf(FERROR,"ERROR: symbolic links not supported\n"); - exit_cleanup(RERR_UNSUPPORTED); - } -#endif - if (am_server) { set_nonblocking(STDIN_FILENO); set_nonblocking(STDOUT_FILENO);