X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d365e229678eb7ae758a415d100043f6e07dea35..1b42f628f495ff0cdaa8a7c219d8ce33192281fe:/main.c diff --git a/main.c b/main.c index e2d6aa7f..9f2e2a9f 100644 --- a/main.c +++ b/main.c @@ -4,11 +4,11 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * Copyright (C) 2003-2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,11 +17,12 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" +#include "ifuncs.h" +#include "io.h" #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H #include #endif @@ -34,9 +35,9 @@ extern int am_server; extern int am_sender; extern int am_generator; extern int am_daemon; +extern int inc_recurse; extern int blocking_io; extern int remove_source_files; -extern int daemon_over_rsh; extern int need_messages_from_generator; extern int kluge_around_eof; extern int do_stats; @@ -47,7 +48,9 @@ extern int copy_dirlinks; extern int keep_dirlinks; extern int preserve_hard_links; extern int protocol_version; +extern int file_total; extern int recurse; +extern int protect_args; extern int relative_paths; extern int sanitize_paths; extern int curr_dir_depth; @@ -58,7 +61,6 @@ 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 struct stats stats; @@ -68,13 +70,18 @@ extern char *basis_dir[]; extern char *rsync_path; extern char *shell_cmd; extern char *batch_name; +extern char *password_file; extern char curr_dir[MAXPATHLEN]; +extern struct file_list *first_flist; extern struct filter_list_struct server_filter_list; +#ifdef ICONV_OPTION +extern iconv_t ic_send; +#endif int local_server = 0; -int new_root_dir = 0; +int daemon_over_rsh = 0; mode_t orig_umask = 0; -struct file_list *the_file_list; +int batch_gen_fd = -1; /* There's probably never more than at most 2 outstanding child processes, * but set it higher, just in case. */ @@ -189,12 +196,12 @@ static void handle_stats(int f) if (am_server) { if (am_sender) { - write_longint(f, total_read); - write_longint(f, total_written); - write_longint(f, stats.total_size); + write_varlong30(f, total_read, 3); + write_varlong30(f, total_written, 3); + write_varlong30(f, stats.total_size, 3); if (protocol_version >= 29) { - write_longint(f, stats.flist_buildtime); - write_longint(f, stats.flist_xfertime); + write_varlong30(f, stats.flist_buildtime, 3); + write_varlong30(f, stats.flist_xfertime, 3); } } return; @@ -207,22 +214,22 @@ static void handle_stats(int f) 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); - total_read = read_longint(f); - stats.total_size = read_longint(f); + total_written = read_varlong30(f, 3); + total_read = read_varlong30(f, 3); + stats.total_size = read_varlong30(f, 3); if (protocol_version >= 29) { - stats.flist_buildtime = read_longint(f); - stats.flist_xfertime = read_longint(f); + stats.flist_buildtime = read_varlong30(f, 3); + stats.flist_xfertime = read_varlong30(f, 3); } } 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); + write_varlong30(batch_fd, total_read, 3); + write_varlong30(batch_fd, total_written, 3); + write_varlong30(batch_fd, stats.total_size, 3); if (protocol_version >= 29) { - write_longint(batch_fd, stats.flist_buildtime); - write_longint(batch_fd, stats.flist_xfertime); + write_varlong30(batch_fd, stats.flist_buildtime, 3); + write_varlong30(batch_fd, stats.flist_xfertime, 3); } } } @@ -315,8 +322,8 @@ 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 **remote_argv, int remote_argc, + int *f_in_p, int *f_out_p) { int i, argc = 0; char *args[MAX_ARGS]; @@ -339,10 +346,8 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, if (*f == ' ') continue; /* Comparison leaves rooms for server_options(). */ - if (argc >= MAX_ARGS - MAX_SERVER_ARGS) { - rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); - exit_cleanup(RERR_SYNTAX); - } + if (argc >= MAX_ARGS - MAX_SERVER_ARGS) + goto arg_overflow; args[argc++] = t; while (*f != ' ' || in_quote) { if (!*f) { @@ -406,16 +411,23 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, server_options(args,&argc); - if (argc >= MAX_ARGS - 2) { - rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); - exit_cleanup(RERR_SYNTAX); - } + if (argc >= MAX_ARGS - 2) + goto arg_overflow; } args[argc++] = "."; - if (!daemon_over_rsh && path && *path) - args[argc++] = path; + if (!daemon_over_rsh) { + while (remote_argc > 0) { + if (argc >= MAX_ARGS - 1) { + arg_overflow: + rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n"); + exit_cleanup(RERR_SYNTAX); + } + args[argc++] = *remote_argv++; + remote_argc--; + } + } args[argc] = NULL; @@ -432,17 +444,54 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, exit_cleanup(RERR_IPC); } batch_gen_fd = from_gen_pipe[0]; - *f_out = from_gen_pipe[1]; - *f_in = batch_fd; + *f_out_p = from_gen_pipe[1]; + *f_in_p = batch_fd; ret = -1; /* no child pid */ } else if (local_server) { /* If the user didn't request --[no-]whole-file, force * it on, but only if we're not batch processing. */ if (whole_file < 0 && !write_batch) whole_file = 1; - ret = local_child(argc, args, f_in, f_out, child_main); - } else - ret = piped_child(args,f_in,f_out); + ret = local_child(argc, args, f_in_p, f_out_p, child_main); + } else { + if (protect_args) { + int fd; +#ifdef ICONV_OPTION + int convert = ic_send != (iconv_t)-1; + xbuf outbuf, inbuf; + + if (convert) + alloc_xbuf(&outbuf, 1024); +#endif + + ret = piped_child(args, f_in_p, f_out_p); + + for (i = 0; args[i]; i++) {} /* find first NULL */ + args[i] = "rsync"; /* set a new arg0 */ + if (verbose > 1) + print_child_argv("protected args:", args + i + 1); + fd = *f_out_p; + do { +#ifdef ICONV_OPTION + if (convert) { + INIT_XBUF_STRLEN(inbuf, args[i]); + iconvbufs(ic_send, &inbuf, &outbuf, + ICB_EXPAND_OUT | ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + outbuf.buf[outbuf.len] = '\0'; + write_buf(fd, outbuf.buf, outbuf.len + 1); + outbuf.len = 0; + } else +#endif + write_buf(fd, args[i], strlen(args[i]) + 1); + } while (args[++i]); + write_byte(fd, 0); +#ifdef ICONV_OPTION + if (convert) + free(outbuf.buf); +#endif + } else + ret = piped_child(args, f_in_p, f_out_p); + } if (dir) free(dir); @@ -475,7 +524,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path) if (verbose > 2) { rprintf(FINFO, "get_local_name count=%d %s\n", - flist->count, NS(dest_path)); + file_total, NS(dest_path)); } if (!dest_path || list_only) @@ -492,14 +541,13 @@ static char *get_local_name(struct file_list *flist, char *dest_path) } return NULL; } - if (flist->count > 1) { + if (file_total > 1) { rprintf(FERROR, "ERROR: destination must be a directory when" " copying more than 1 file\n"); exit_cleanup(RERR_FILESELECT); } - /* Caution: flist->count could be 0! */ - if (flist->count == 1 && S_ISDIR(flist->files[0]->mode)) { + if (file_total == 1 && S_ISDIR(flist->files[0]->mode)) { rprintf(FERROR, "ERROR: cannot overwrite non-directory" " with a directory\n"); @@ -517,7 +565,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path) /* If we need a destination directory because the transfer is not * of a single non-directory or the user has requested one via a * destination path ending in a slash, create one and use mode 1. */ - if (flist->count > 1 || (cp && !cp[1])) { + if (file_total > 1 || (cp && !cp[1])) { /* Lop off the final slash (if any). */ if (cp && !cp[1]) *cp = '\0'; @@ -534,7 +582,8 @@ static char *get_local_name(struct file_list *flist, char *dest_path) exit_cleanup(RERR_FILEIO); } - new_root_dir = 1; + if (strcmp(flist->files[0]->basename, ".") == 0) + flist->files[0]->flags |= FLAG_DIR_CREATED; if (verbose) rprintf(FINFO, "created directory %s\n", dest_path); @@ -608,19 +657,17 @@ static void fix_basis_dirs(void) } /* This is only called by the sender. */ -static void read_final_goodbye(int f_in, int f_out) +static void read_final_goodbye(int f_in) { - int i; + int i, iflags, xlen; + uchar fnamecmp_type; + char xname[MAXPATHLEN]; if (protocol_version < 29) i = read_int(f_in); else { - while ((i = read_int(f_in)) == the_file_list->count - && read_shortint(f_in) == ITEM_IS_NEW) { - /* Forward the keep-alive (no-op) to the receiver. */ - write_int(f_out, the_file_list->count); - write_shortint(f_out, ITEM_IS_NEW); - } + i = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type, + xname, &xlen); } if (i != NDX_DONE) { @@ -630,7 +677,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[]) { struct file_list *flist; @@ -671,25 +717,22 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[]) } flist = send_file_list(f_out,argc,argv); - if (!flist || flist->count == 0) { + if (!flist || flist->used == 0) exit_cleanup(0); - } - the_file_list = flist; - io_start_buffering_in(); - io_start_buffering_out(); + io_start_buffering_in(f_in); - send_files(flist,f_out,f_in); + send_files(f_in, f_out); io_flush(FULL_FLUSH); handle_stats(f_out); if (protocol_version >= 24) - read_final_goodbye(f_in, f_out); + read_final_goodbye(f_in); io_flush(FULL_FLUSH); exit_cleanup(0); } -static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) +static int do_recv(int f_in, int f_out, char *local_name) { int pid; int exit_code = 0; @@ -700,8 +743,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) copy_links = copy_dirlinks = 0; #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links) - init_hard_links(); + if (preserve_hard_links && !inc_recurse) + match_hard_links(first_flist); #endif if (fd_pair(error_pipe) < 0) { @@ -722,26 +765,32 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) close(f_out); /* we can't let two processes write to the socket at one time */ - close_multiplexing_out(); + io_end_multiplex_out(); /* set place to send errors */ set_msg_fd_out(error_pipe[1]); + io_start_buffering_out(error_pipe[1]); - recv_files(f_in, flist, local_name); + recv_files(f_in, local_name); io_flush(FULL_FLUSH); handle_stats(f_in); - send_msg(MSG_DONE, "", 0); + send_msg(MSG_DONE, "", 1, 0); + write_varlong(error_pipe[1], stats.total_read, 3); io_flush(FULL_FLUSH); /* Handle any keep-alive packets from the post-processing work * that the generator does. */ if (protocol_version >= 29) { + int iflags, xlen; + uchar fnamecmp_type; + char xname[MAXPATHLEN]; + 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) {} + read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type, + xname, &xlen); rprintf(FERROR, "Invalid packet at end of run [%s]\n", who_am_i()); @@ -756,7 +805,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) } am_generator = 1; - close_multiplexing_in(); + + io_end_multiplex_in(); if (write_batch && !am_server) stop_write_batch(); @@ -764,17 +814,26 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) if (f_in != f_out) close(f_in); - io_start_buffering_out(); + io_start_buffering_out(f_out); set_msg_fd_in(error_pipe[0]); + io_start_buffering_in(error_pipe[0]); - generate_files(f_out, flist, local_name); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links && inc_recurse) { + struct file_list *flist; + for (flist = first_flist; flist; flist = flist->next) + match_hard_links(flist); + } +#endif + + generate_files(f_out, local_name); handle_stats(-1); io_flush(FULL_FLUSH); if (protocol_version >= 24) { /* send a final goodbye message */ - write_int(f_out, NDX_DONE); + write_ndx(f_out, NDX_DONE); } io_flush(FULL_FLUSH); @@ -784,8 +843,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name) return exit_code; } - -static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) +static void do_server_recv(int f_in, int f_out, int argc, char *argv[]) { int exit_code; struct file_list *flist; @@ -821,7 +879,10 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } } - io_start_buffering_in(); + if (protocol_version >= 30) + io_start_multiplex_in(); + else + io_start_buffering_in(f_in); recv_filter_list(f_in); if (filesfrom_fd >= 0) { @@ -835,12 +896,13 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } flist = recv_file_list(f_in); - verbose = save_verbose; if (!flist) { rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); } - the_file_list = flist; + if (inc_recurse && file_total == 1) + recv_additional_file_list(f_in); + verbose = save_verbose; if (argc > 0) local_name = get_local_name(flist,argv[0]); @@ -875,7 +937,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) } } - exit_code = do_recv(f_in,f_out,flist,local_name); + exit_code = do_recv(f_in, f_out, local_name); exit_cleanup(exit_code); } @@ -894,9 +956,6 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) io_set_sock_fds(f_in, f_out); setup_protocol(f_out, f_in); -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H - setup_iconv(); -#endif if (protocol_version >= 23) io_start_multiplex_out(); @@ -905,12 +964,10 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) keep_dirlinks = 0; /* Must be disabled on the sender. */ if (need_messages_from_generator) io_start_multiplex_in(); - recv_filter_list(f_in); do_server_sender(f_in, f_out, argc, argv); - } else { + } else do_server_recv(f_in, f_out, argc, argv); - } exit_cleanup(0); } @@ -933,12 +990,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) io_set_sock_fds(f_in, f_out); setup_protocol(f_out,f_in); -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H - setup_iconv(); -#endif - - 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 @@ -952,7 +1003,10 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ - io_start_buffering_out(); + if (protocol_version >= 30) + io_start_multiplex_out(); + else + io_start_buffering_out(f_out); if (!filesfrom_host) set_msg_fd_in(f_in); send_filter_list(f_out); @@ -965,14 +1019,16 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) set_msg_fd_in(-1); if (verbose > 3) rprintf(FINFO,"file list sent\n"); - the_file_list = flist; + + if (protocol_version >= 23) + io_start_multiplex_in(); io_flush(NORMAL_FLUSH); - send_files(flist,f_out,f_in); + send_files(f_in, f_out); io_flush(FULL_FLUSH); handle_stats(-1); if (protocol_version >= 24) - read_final_goodbye(f_in, f_out); + read_final_goodbye(f_in); if (pid != -1) { if (verbose > 3) rprintf(FINFO,"client_run waiting on %d\n", (int) pid); @@ -984,8 +1040,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) exit_cleanup(exit_code); } - if (need_messages_from_generator && !read_batch) - io_start_multiplex_out(); + if (!read_batch) { + if (protocol_version >= 23) + io_start_multiplex_in(); + if (need_messages_from_generator) + io_start_multiplex_out(); + } if (argc == 0) list_only |= 1; @@ -1000,14 +1060,15 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (write_batch && !am_server) start_write_batch(f_in); flist = recv_file_list(f_in); - the_file_list = flist; + if (inc_recurse && file_total == 1) + recv_additional_file_list(f_in); - if (flist && flist->count > 0) { + if (flist && flist->used > 0) { local_name = get_local_name(flist, argv[0]); fix_basis_dirs(); - exit_code2 = do_recv(f_in, f_out, flist, local_name); + exit_code2 = do_recv(f_in, f_out, local_name); } else { handle_stats(-1); output_summary(); @@ -1023,7 +1084,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) return MAX(exit_code, exit_code2); } -static int copy_argv (char *argv[]) +static int copy_argv(char *argv[]) { int i; @@ -1049,66 +1110,68 @@ static int copy_argv (char *argv[]) **/ static int start_client(int argc, char *argv[]) { - char *p; - char *shell_machine = NULL; - char *shell_path = NULL; - char *shell_user = NULL; + char *p, *shell_machine = NULL, *shell_user = NULL; + char **remote_argv; + int remote_argc; + int f_in, f_out; int ret; pid_t pid; - int f_in,f_out; - int rc; /* Don't clobber argv[] so that ps(1) can still show the right * command line. */ - if ((rc = copy_argv(argv))) - return rc; + if ((ret = copy_argv(argv)) != 0) + return ret; if (!read_batch) { /* for read_batch, NO source is specified */ - shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); - if (shell_path) { /* source is remote */ + char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); + if (path) { /* source is remote */ char *dummy1; int dummy2; - if (--argc - && check_for_hostspec(argv[argc], &dummy1, &dummy2)) { + *argv = path; + remote_argv = argv; + remote_argc = argc; + argv += argc - 1; + if (argc == 1 || **argv == ':') + argc = 0; /* no dest arg */ + else if (check_for_hostspec(*argv, &dummy1, &dummy2)) { rprintf(FERROR, "The source and destination cannot both be remote.\n"); exit_cleanup(RERR_SYNTAX); + } else { + remote_argc--; /* don't count dest */ + argc = 1; } - argv++; if (filesfrom_host && *filesfrom_host && strcmp(filesfrom_host, shell_machine) != 0) { rprintf(FERROR, "--files-from hostname is not the same as the transfer hostname\n"); exit_cleanup(RERR_SYNTAX); } - if (rsync_port) { - if (!shell_cmd) { - return start_socket_client(shell_machine, - shell_path, - argc, argv); - } - daemon_over_rsh = 1; - } - am_sender = 0; + if (rsync_port) + daemon_over_rsh = shell_cmd ? 1 : -1; } else { /* source is local, check dest arg */ am_sender = 1; - if (argc > 1) + if (argc > 1) { p = argv[--argc]; - else { - p = "."; + remote_argv = argv + argc; + } else { + static char *dotarg[1] = { "." }; + p = dotarg[0]; + remote_argv = dotarg; list_only = 1; } + remote_argc = 1; - shell_path = check_for_hostspec(p, &shell_machine, &rsync_port); - if (shell_path && filesfrom_host && *filesfrom_host + path = check_for_hostspec(p, &shell_machine, &rsync_port); + if (path && filesfrom_host && *filesfrom_host && strcmp(filesfrom_host, shell_machine) != 0) { rprintf(FERROR, "--files-from hostname is not the same as the transfer hostname\n"); exit_cleanup(RERR_SYNTAX); } - if (!shell_path) { /* no hostspec found, so src & dest are local */ + if (!path) { /* no hostspec found, so src & dest are local */ local_server = 1; if (filesfrom_host) { rprintf(FERROR, @@ -1116,23 +1179,55 @@ static int start_client(int argc, char *argv[]) exit_cleanup(RERR_SYNTAX); } shell_machine = NULL; - shell_path = p; - } else if (rsync_port) { - if (!shell_cmd) { - return start_socket_client(shell_machine, - shell_path, - argc, argv); - } - daemon_over_rsh = 1; + } else { /* hostspec was found, so dest is remote */ + argv[argc] = path; + if (rsync_port) + daemon_over_rsh = shell_cmd ? 1 : -1; } } } else { /* read_batch */ local_server = 1; - shell_path = argv[argc-1]; - if (check_for_hostspec(shell_path, &shell_machine, &rsync_port)) { + if (check_for_hostspec(argv[argc-1], &shell_machine, &rsync_port)) { rprintf(FERROR, "remote destination is not allowed with --read-batch\n"); exit_cleanup(RERR_SYNTAX); } + remote_argv = argv + argc - 1; + remote_argc = 1; + } + + if (am_sender) { + char *dummy1; + int dummy2; + int i; + /* For local source, extra source args must not have hostspec. */ + for (i = 1; i < argc; i++) { + if (check_for_hostspec(argv[i], &dummy1, &dummy2)) { + rprintf(FERROR, "Unexpected remote arg: %s\n", argv[i]); + exit_cleanup(RERR_SYNTAX); + } + } + } else { + int i; + /* For remote source, any extra source args must be ":SOURCE" args. */ + for (i = 1; i < remote_argc; i++) { + if (*remote_argv[i] != ':') { + rprintf(FERROR, "Unexpected local arg: %s\n", remote_argv[i]); + rprintf(FERROR, "If arg is a remote file/dir, prefix it with a colon (:).\n"); + exit_cleanup(RERR_SYNTAX); + } + remote_argv[i]++; + } + if (argc == 0) + list_only |= 1; + } + + if (daemon_over_rsh < 0) + return start_socket_client(shell_machine, remote_argc, remote_argv, argc, argv); + + if (password_file && !daemon_over_rsh) { + rprintf(FERROR, "The --password-file option may only be " + "used when accessing an rsync daemon.\n"); + exit_cleanup(RERR_SYNTAX); } if (shell_machine) { @@ -1146,31 +1241,18 @@ 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 : ""); - } - - /* for remote source, only single dest arg can remain ... */ - if (!am_sender && argc > 1) { - usage(FERROR); - exit_cleanup(RERR_SYNTAX); + NS(shell_cmd), NS(shell_machine), NS(shell_user), + remote_argv ? NS(remote_argv[0]) : ""); } - /* ... 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); + pid = do_cmd(shell_cmd, shell_machine, shell_user, remote_argv, remote_argc, + &f_in, &f_out); /* if we're running an rsync server on the remote host over a * remote shell command, we need to do the RSYNCD protocol first */ if (daemon_over_rsh) { int tmpret; - tmpret = start_inband_exchange(shell_user, shell_path, - f_in, f_out, argc); + tmpret = start_inband_exchange(f_in, f_out, shell_user, remote_argc, remote_argv); if (tmpret < 0) return tmpret; } @@ -1365,6 +1447,9 @@ int main(int argc,char *argv[]) } if (read_batch) read_stream_flags(batch_fd); + else + write_stream_flags(batch_fd); + } if (write_batch < 0) dry_run = 1; @@ -1372,6 +1457,16 @@ int main(int argc,char *argv[]) if (am_daemon && !am_server) return daemon_main(); + if (am_server && protect_args) { + char buf[MAXPATHLEN]; + protect_args = 2; + read_args(STDIN_FILENO, NULL, buf, sizeof buf, 1, &argv, &argc, NULL); + if (!parse_arguments(&argc, (const char ***) &argv, 1)) { + option_error(); + exit_cleanup(RERR_SYNTAX); + } + } + if (argc < 1) { usage(FERROR); exit_cleanup(RERR_SYNTAX);