X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f3d6d4800b35fd65d2395defdb57fed16cea3e85..3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47:/main.c diff --git a/main.c b/main.c index 2d2b697f..4c040b99 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,14 +35,13 @@ extern int am_server; extern int am_sender; extern int am_generator; extern int am_daemon; -extern int incremental; +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; -extern int log_got_error; +extern int got_xfer_error; extern int module_id; extern int copy_links; extern int copy_dirlinks; @@ -50,6 +50,8 @@ extern int preserve_hard_links; extern int protocol_version; extern int file_total; extern int recurse; +extern int xfer_dirs; +extern int protect_args; extern int relative_paths; extern int sanitize_paths; extern int curr_dir_depth; @@ -71,10 +73,14 @@ 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; int batch_gen_fd = -1; @@ -191,12 +197,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; @@ -209,22 +215,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); } } } @@ -266,9 +272,10 @@ static void output_summary(void) "sent %s bytes received %s bytes %s bytes/sec\n", human_num(total_written), human_num(total_read), human_dnum((total_written + total_read)/(0.5 + (endtime - starttime)), 2)); - rprintf(FINFO, "total size is %s speedup is %.2f\n", + rprintf(FINFO, "total size is %s speedup is %.2f%s\n", human_num(stats.total_size), - (double)stats.total_size / (total_written+total_read)); + (double)stats.total_size / (total_written+total_read), + dry_run ? " (DRY RUN)" : ""); } fflush(stdout); @@ -317,8 +324,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]; @@ -341,10 +348,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) { @@ -408,16 +413,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; @@ -429,22 +441,70 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char *path, if (read_batch) { int from_gen_pipe[2]; + set_allow_inc_recurse(); if (fd_pair(from_gen_pipe) < 0) { rsyserr(FERROR, errno, "pipe"); 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 */ +#ifdef ICONV_CONST + setup_iconv(); +#endif } 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); + set_allow_inc_recurse(); + ret = local_child(argc, args, f_in_p, f_out_p, child_main); +#ifdef ICONV_CONST + setup_iconv(); +#endif + } else { +#ifdef ICONV_CONST + setup_iconv(); +#endif + 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); @@ -535,7 +595,9 @@ static char *get_local_name(struct file_list *flist, char *dest_path) exit_cleanup(RERR_FILEIO); } - new_root_dir = 1; + if (flist->high >= flist->low + && strcmp(flist->files[flist->low]->basename, ".") == 0) + flist->files[0]->flags |= FLAG_DIR_CREATED; if (verbose) rprintf(FINFO, "created directory %s\n", dest_path); @@ -609,7 +671,7 @@ 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, iflags, xlen; uchar fnamecmp_type; @@ -618,8 +680,8 @@ static void read_final_goodbye(int f_in, int f_out) if (protocol_version < 29) i = read_int(f_in); else { - i = read_ndx_and_attrs(f_in, f_out, &iflags, - &fnamecmp_type, xname, &xlen); + i = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type, + xname, &xlen); } if (i != NDX_DONE) { @@ -662,14 +724,14 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[]) argc--; argv++; - if (argc == 0 && (recurse || list_only)) { + if (argc == 0 && (recurse || xfer_dirs || list_only)) { argc = 1; argv--; argv[0] = "."; } flist = send_file_list(f_out,argc,argv); - if (!flist || flist->count == 0) + if (!flist || flist->used == 0) exit_cleanup(0); io_start_buffering_in(f_in); @@ -678,7 +740,7 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[]) 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); } @@ -695,8 +757,8 @@ static int do_recv(int f_in, int f_out, char *local_name) copy_links = copy_dirlinks = 0; #ifdef SUPPORT_HARD_LINKS - if (preserve_hard_links) - match_hard_links(); + if (preserve_hard_links && !inc_recurse) + match_hard_links(first_flist); #endif if (fd_pair(error_pipe) < 0) { @@ -727,7 +789,8 @@ static int do_recv(int f_in, int f_out, char *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 @@ -740,7 +803,7 @@ static int do_recv(int f_in, int f_out, char *local_name) kluge_around_eof = -1; /* This should only get stopped via a USR2 signal. */ - read_ndx_and_attrs(f_in, -1, &iflags, &fnamecmp_type, + read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type, xname, &xlen); rprintf(FERROR, "Invalid packet at end of run [%s]\n", @@ -770,13 +833,21 @@ static int do_recv(int f_in, int f_out, char *local_name) set_msg_fd_in(error_pipe[0]); io_start_buffering_in(error_pipe[0]); +#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); @@ -843,7 +914,7 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[]) rprintf(FERROR,"server_recv: recv_file_list error\n"); exit_cleanup(RERR_FILESELECT); } - if (incremental && file_total == 1) + if (inc_recurse && file_total == 1) recv_additional_file_list(f_in); verbose = save_verbose; @@ -855,10 +926,10 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[]) if (sanitize_paths) { char **dir; for (dir = basis_dir; *dir; dir++) { - *dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth, NULL); + *dir = sanitize_path(NULL, *dir, NULL, curr_dir_depth); } if (partial_dir) { - partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth, NULL); + partial_dir = sanitize_path(NULL, partial_dir, NULL, curr_dir_depth); } } fix_basis_dirs(); @@ -899,9 +970,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(); @@ -936,9 +1004,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 /* We set our stderr file handle to blocking because ssh might have * set it to non-blocking. This can be particularly troublesome if @@ -977,7 +1042,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) 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); @@ -996,8 +1061,10 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) io_start_multiplex_out(); } - if (argc == 0) + if (argc == 0) { list_only |= 1; + xfer_dirs |= 1; + } send_filter_list(read_batch ? -1 : f_out); @@ -1009,10 +1076,10 @@ 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); - if (incremental && file_total == 1) + 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(); @@ -1059,66 +1126,69 @@ 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 *dummy1; - int dummy2; - if (--argc - && check_for_hostspec(argv[argc], &dummy1, &dummy2)) { + char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); + if (path) { /* source is remote */ + char *dummy_host; + int dummy_port = 0; + *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, &dummy_host, &dummy_port)) { 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 = "."; - list_only = 1; + remote_argv = argv + argc; + } else { + static char *dotarg[1] = { "." }; + p = dotarg[0]; + remote_argv = dotarg; + list_only |= 1; + xfer_dirs |= 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, @@ -1126,25 +1196,68 @@ 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 *dummy_host; + int dummy_port = rsync_port; + int i; + /* For local source, extra source args must not have hostspec. */ + for (i = 1; i < argc; i++) { + if (check_for_hostspec(argv[i], &dummy_host, &dummy_port)) { + rprintf(FERROR, "Unexpected remote arg: %s\n", argv[i]); + exit_cleanup(RERR_SYNTAX); + } + } + } else { + char *dummy_host; + int dummy_port = rsync_port; + int i; + /* For remote source, any extra source args must have either + * the same hostname or an empty hostname. */ + for (i = 1; i < remote_argc; i++) { + char *arg = check_for_hostspec(remote_argv[i], &dummy_host, &dummy_port); + if (!arg) { + 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); + } + if (*dummy_host && strcmp(dummy_host, shell_machine) != 0) { + rprintf(FERROR, "All source args must come from the same machine.\n"); + exit_cleanup(RERR_SYNTAX); + } + if (rsync_port != dummy_port) { + if (!rsync_port || !dummy_port) + rprintf(FERROR, "All source args must use the same hostspec format.\n"); + else + rprintf(FERROR, "All source args must use the same port number.\n"); + exit_cleanup(RERR_SYNTAX); + } + remote_argv[i] = arg; + } + if (argc == 0) { + list_only |= 1; + xfer_dirs |= 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"); @@ -1162,31 +1275,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; } @@ -1210,7 +1310,7 @@ static RETSIGTYPE sigusr2_handler(UNUSED(int val)) if (!am_server) output_summary(); close_all(); - if (log_got_error) + if (got_xfer_error) _exit(RERR_PARTIAL); _exit(0); } @@ -1388,9 +1488,23 @@ int main(int argc,char *argv[]) if (write_batch < 0) dry_run = 1; - if (am_daemon && !am_server) + if (am_server) { +#ifdef ICONV_CONST + setup_iconv(); +#endif + } else if (am_daemon) 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);