Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made list more complete.
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
544bba7
..
80c44a3
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-6,8
+6,9
@@
* Copyright (C) 2004-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 2004-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 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
*
* 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
* 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 "rsync.h"
@@
-33,31
+33,39
@@
extern int inplace;
extern int recurse;
extern int use_qsort;
extern int allow_inc_recurse;
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 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 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_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 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 *shell_cmd; /* contains VER.SUB string if client is a pre-release */
-extern char *backup_dir, *backup_suffix;
extern char *partial_dir;
extern char *dest_option;
extern char *partial_dir;
extern char *dest_option;
+extern char *files_from;
+extern char *filesfrom_host;
extern struct filter_list_struct filter_list;
extern struct filter_list_struct filter_list;
+#ifdef ICONV_OPTION
+extern char *iconv_opt;
+extern iconv_t ic_send, ic_recv;
+#endif
/* These index values are for the file-list's extra-attribute array. */
int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx;
/* These index values are for the file-list's extra-attribute array. */
int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx;
+#ifdef ICONV_OPTION
+int ic_ndx;
+
+int filesfrom_convert = 0;
+#endif
/* 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
/* 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
+74,19
@@
static void check_sub_protocol(void)
{
char *dot;
int their_protocol, their_sub;
{
char *dot;
int their_protocol, their_sub;
+#if SUBPROTOCOL_VERSION != 0
int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
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))
|| !(their_sub = atoi(dot+1))) {
if (!shell_cmd || !(dot = strchr(shell_cmd, '.'))
|| !(their_protocol = atoi(shell_cmd))
|| !(their_sub = atoi(dot+1))) {
+#if SUBPROTOCOL_VERSION != 0
if (our_sub)
protocol_version--;
if (our_sub)
protocol_version--;
+#endif
return;
}
return;
}
@@
-83,7
+97,7
@@
static void check_sub_protocol(void)
}
if (their_protocol > protocol_version)
}
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--;
}
if (their_sub != our_sub)
protocol_version--;
}
@@
-91,7
+105,7
@@
static void check_sub_protocol(void)
void setup_protocol(int f_out,int f_in)
{
if (am_sender)
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)
else
file_extra_cnt++;
if (preserve_uid)
@@
-144,13
+158,8
@@
void setup_protocol(int f_out,int f_in)
}
if (protocol_version < 30) {
}
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"
if (preserve_acls && !local_server) {
rprintf(FERROR,
"--acls requires protocol 30 or higher"
@@
-207,13
+216,18
@@
void setup_protocol(int f_out,int f_in)
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
- if (recurse && allow_inc_recurse
&& !preserve_hard_links
+ if (recurse && allow_inc_recurse
&& !delete_before && !delete_after && !delay_updates
&& !delete_before && !delete_after && !delay_updates
- && !
prune_empty_dirs && !use_qsort
)
+ && !
use_qsort && !prune_empty_dirs
)
inc_recurse = 1;
need_messages_from_generator = 1;
}
inc_recurse = 1;
need_messages_from_generator = 1;
}
+#ifdef ICONV_OPTION
+ if (iconv_opt && (!am_sender || inc_recurse))
+ ic_ndx = ++file_extra_cnt;
+#endif
+
if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
if (!am_sender || protocol_version >= 30)
if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
if (!am_sender || protocol_version >= 30)
@@
-221,6
+235,16
@@
void setup_protocol(int f_out,int f_in)
parse_rule(&filter_list, partial_dir, flags, 0);
}
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);
if (am_server) {
if (!checksum_seed)
checksum_seed = time(NULL);