X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9742b386b3d5b3010675aef9febaffbf8ab2d2c0..b3bf9b9df95137a3a43248be9599d919b04877af:/compat.c diff --git a/compat.c b/compat.c index 544bba76..6e000724 100644 --- a/compat.c +++ b/compat.c @@ -3,11 +3,12 @@ * * Copyright (C) Andrew Tridgell 1996 * Copyright (C) Paul Mackerras 1996 - * Copyright (C) 2004-2007 Wayne Davison + * Copyright (C) 2004-2009 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * 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, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,8 +16,7 @@ * 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" @@ -25,7 +25,6 @@ int remote_protocol = 0; int file_extra_cnt = 0; /* count of file-list extras that everyone gets */ int inc_recurse = 0; -extern int verbose; extern int am_server; extern int am_sender; extern int local_server; @@ -33,31 +32,48 @@ extern int inplace; extern int recurse; extern int use_qsort; extern int allow_inc_recurse; +extern int append_mode; extern int fuzzy_basis; extern int read_batch; -extern int max_delete; extern int delay_updates; extern int checksum_seed; extern int basis_dir_cnt; extern int prune_empty_dirs; extern int protocol_version; +extern int protect_args; extern int preserve_uid; extern int preserve_gid; extern int preserve_acls; extern int preserve_xattrs; -extern int preserve_hard_links; extern int need_messages_from_generator; extern int delete_mode, delete_before, delete_during, delete_after; -extern int delete_excluded; -extern int make_backups; -extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */ -extern char *backup_dir, *backup_suffix; +extern char *shell_cmd; extern char *partial_dir; extern char *dest_option; +extern char *files_from; +extern char *filesfrom_host; extern struct filter_list_struct filter_list; +extern int need_unsorted_flist; +#ifdef ICONV_OPTION +extern iconv_t ic_send, ic_recv; +extern char *iconv_opt; +#endif /* These index values are for the file-list's extra-attribute array. */ -int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx; +int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx; + +int receiver_symlink_times = 0; /* receiver can set the time on a symlink */ +int sender_symlink_iconv = 0; /* sender should convert symlink content */ + +#ifdef ICONV_OPTION +int filesfrom_convert = 0; +#endif + +#define CF_INC_RECURSE (1<<0) +#define CF_SYMLINK_TIMES (1<<1) +#define CF_SYMLINK_ICONV (1<<2) + +static const char *client_info; /* The server makes sure that if either side only supports a pre-release * version of a protocol, that both sides must speak a compatible version @@ -66,13 +82,20 @@ static void check_sub_protocol(void) { char *dot; int their_protocol, their_sub; +#if SUBPROTOCOL_VERSION != 0 int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION; +#else + int our_sub = 0; +#endif - if (!shell_cmd || !(dot = strchr(shell_cmd, '.')) - || !(their_protocol = atoi(shell_cmd)) + /* client_info starts with VER.SUB string if client is a pre-release. */ + if (!(their_protocol = atoi(client_info)) + || !(dot = strchr(client_info, '.')) || !(their_sub = atoi(dot+1))) { +#if SUBPROTOCOL_VERSION != 0 if (our_sub) protocol_version--; +#endif return; } @@ -83,15 +106,30 @@ static void check_sub_protocol(void) } if (their_protocol > protocol_version) - their_sub = 0; /* 0 == final version */ + their_sub = 0; /* 0 == final version of older protocol */ if (their_sub != our_sub) protocol_version--; } +void set_allow_inc_recurse(void) +{ + client_info = shell_cmd ? shell_cmd : ""; + + if (!recurse || use_qsort) + allow_inc_recurse = 0; + else if (!am_sender + && (delete_before || delete_after + || delay_updates || prune_empty_dirs)) + allow_inc_recurse = 0; + else if (am_server && !local_server + && (strchr(client_info, 'i') == NULL)) + allow_inc_recurse = 0; +} + void setup_protocol(int f_out,int f_in) { if (am_sender) - file_extra_cnt += PTR_EXTRA_LEN; + file_extra_cnt += PTR_EXTRA_CNT; else file_extra_cnt++; if (preserve_uid) @@ -103,6 +141,9 @@ void setup_protocol(int f_out,int f_in) if (preserve_xattrs) xattrs_ndx = ++file_extra_cnt; + if (am_server) + set_allow_inc_recurse(); + if (remote_protocol == 0) { if (am_server && !local_server) check_sub_protocol(); @@ -118,7 +159,7 @@ void setup_protocol(int f_out,int f_in) exit_cleanup(RERR_PROTOCOL); } - if (verbose > 3) { + if (DEBUG_GTE(PROTO, 1)) { rprintf(FINFO, "(%s) Protocol versions: remote=%d, negotiated=%d\n", am_server? "Server" : "Client", remote_protocol, protocol_version); } @@ -142,15 +183,12 @@ void setup_protocol(int f_out,int f_in) PROTOCOL_VERSION, am_server? "Server" : "Client"); exit_cleanup(RERR_PROTOCOL); } + if (read_batch) + check_batch_flags(); if (protocol_version < 30) { - if (max_delete == 0 && am_sender) { - rprintf(FERROR, - "--max-delete=0 requires protocol 30 or higher" - " (negotiated %d).\n", - protocol_version); - exit_cleanup(RERR_PROTOCOL); - } + if (append_mode == 1) + append_mode = 2; if (preserve_acls && !local_server) { rprintf(FERROR, "--acls requires protocol 30 or higher" @@ -207,13 +245,51 @@ void setup_protocol(int f_out,int f_in) exit_cleanup(RERR_PROTOCOL); } } else if (protocol_version >= 30) { - if (recurse && allow_inc_recurse && !preserve_hard_links - && !delete_before && !delete_after && !delay_updates - && !prune_empty_dirs && !use_qsort) - inc_recurse = 1; + int compat_flags; + if (am_server) { + compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0; +#if defined HAVE_LUTIMES && defined HAVE_UTIMES + compat_flags |= CF_SYMLINK_TIMES; +#endif +#ifdef ICONV_OPTION + compat_flags |= CF_SYMLINK_ICONV; +#endif + write_byte(f_out, compat_flags); + } else + compat_flags = read_byte(f_in); + /* The inc_recurse var MUST be set to 0 or 1. */ + inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0; + if (am_sender) { + receiver_symlink_times = am_server + ? strchr(client_info, 'L') != NULL + : !!(compat_flags & CF_SYMLINK_TIMES); + } +#if defined HAVE_LUTIMES && defined HAVE_UTIMES + else + receiver_symlink_times = 1; +#endif +#ifdef ICONV_OPTION + sender_symlink_iconv = iconv_opt && (am_server + ? strchr(client_info, 's') != NULL + : !!(compat_flags & CF_SYMLINK_ICONV)); +#endif + if (inc_recurse && !allow_inc_recurse) { + /* This should only be able to happen in a batch. */ + fprintf(stderr, + "Incompatible options specified for inc-recursive %s.\n", + read_batch ? "batch file" : "connection"); + exit_cleanup(RERR_SYNTAX); + } need_messages_from_generator = 1; +#if defined HAVE_LUTIMES && defined HAVE_UTIMES + } else if (!am_sender) { + receiver_symlink_times = 1; +#endif } + if (need_unsorted_flist && (!am_sender || inc_recurse)) + unsort_ndx = ++file_extra_cnt; + if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) { int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY; if (!am_sender || protocol_version >= 30) @@ -221,6 +297,16 @@ void setup_protocol(int f_out,int f_in) parse_rule(&filter_list, partial_dir, flags, 0); } + +#ifdef ICONV_OPTION + if (protect_args && files_from) { + if (am_sender) + filesfrom_convert = filesfrom_host && ic_send != (iconv_t)-1; + else + filesfrom_convert = !filesfrom_host && ic_recv != (iconv_t)-1; + } +#endif + if (am_server) { if (!checksum_seed) checksum_seed = time(NULL);