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
Suggest a better solution for a make without wildcard support.
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
6e00072
..
ad29501
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-24,6
+24,8
@@
int remote_protocol = 0;
int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
int inc_recurse = 0;
int remote_protocol = 0;
int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
int inc_recurse = 0;
+int compat_flags = 0;
+int use_safe_inc_flist = 0;
extern int am_server;
extern int am_sender;
extern int am_server;
extern int am_sender;
@@
-52,7
+54,7
@@
extern char *partial_dir;
extern char *dest_option;
extern char *files_from;
extern char *filesfrom_host;
extern char *dest_option;
extern char *files_from;
extern char *filesfrom_host;
-extern
struct filter_list_struc
t filter_list;
+extern
filter_rule_lis
t filter_list;
extern int need_unsorted_flist;
#ifdef ICONV_OPTION
extern iconv_t ic_send, ic_recv;
extern int need_unsorted_flist;
#ifdef ICONV_OPTION
extern iconv_t ic_send, ic_recv;
@@
-72,6
+74,7
@@
int filesfrom_convert = 0;
#define CF_INC_RECURSE (1<<0)
#define CF_SYMLINK_TIMES (1<<1)
#define CF_SYMLINK_ICONV (1<<2)
#define CF_INC_RECURSE (1<<0)
#define CF_SYMLINK_TIMES (1<<1)
#define CF_SYMLINK_ICONV (1<<2)
+#define CF_SAFE_FLIST (1<<3)
static const char *client_info;
static const char *client_info;
@@
-245,15
+248,16
@@
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) {
- int compat_flags;
if (am_server) {
compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
if (am_server) {
compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
-#if
defined HAVE_LUTIMES && defined HAVE_U
TIMES
+#if
def CAN_SET_SYMLINK_
TIMES
compat_flags |= CF_SYMLINK_TIMES;
#endif
#ifdef ICONV_OPTION
compat_flags |= CF_SYMLINK_ICONV;
#endif
compat_flags |= CF_SYMLINK_TIMES;
#endif
#ifdef ICONV_OPTION
compat_flags |= CF_SYMLINK_ICONV;
#endif
+ if (local_server || strchr(client_info, 'f') != NULL)
+ compat_flags |= CF_SAFE_FLIST;
write_byte(f_out, compat_flags);
} else
compat_flags = read_byte(f_in);
write_byte(f_out, compat_flags);
} else
compat_flags = read_byte(f_in);
@@
-264,13
+268,13
@@
void setup_protocol(int f_out,int f_in)
? strchr(client_info, 'L') != NULL
: !!(compat_flags & CF_SYMLINK_TIMES);
}
? strchr(client_info, 'L') != NULL
: !!(compat_flags & CF_SYMLINK_TIMES);
}
-#if
defined HAVE_LUTIMES && defined HAVE_U
TIMES
+#if
def CAN_SET_SYMLINK_
TIMES
else
receiver_symlink_times = 1;
#endif
#ifdef ICONV_OPTION
sender_symlink_iconv = iconv_opt && (am_server
else
receiver_symlink_times = 1;
#endif
#ifdef ICONV_OPTION
sender_symlink_iconv = iconv_opt && (am_server
- ? strchr(client_info, 's') != NULL
+ ?
local_server ||
strchr(client_info, 's') != NULL
: !!(compat_flags & CF_SYMLINK_ICONV));
#endif
if (inc_recurse && !allow_inc_recurse) {
: !!(compat_flags & CF_SYMLINK_ICONV));
#endif
if (inc_recurse && !allow_inc_recurse) {
@@
-280,8
+284,9
@@
void setup_protocol(int f_out,int f_in)
read_batch ? "batch file" : "connection");
exit_cleanup(RERR_SYNTAX);
}
read_batch ? "batch file" : "connection");
exit_cleanup(RERR_SYNTAX);
}
+ use_safe_inc_flist = (compat_flags & CF_SAFE_FLIST) || protocol_version >= 31;
need_messages_from_generator = 1;
need_messages_from_generator = 1;
-#if
defined HAVE_LUTIMES && defined HAVE_U
TIMES
+#if
def CAN_SET_SYMLINK_
TIMES
} else if (!am_sender) {
receiver_symlink_times = 1;
#endif
} else if (!am_sender) {
receiver_symlink_times = 1;
#endif
@@
-291,10
+296,10
@@
void setup_protocol(int f_out,int f_in)
unsort_ndx = ++file_extra_cnt;
if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
unsort_ndx = ++file_extra_cnt;
if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
- int
flags = MATCHFLG_NO_PREFIXES | MATCHFLG
_DIRECTORY;
+ int
rflags = FILTRULE_NO_PREFIXES | FILTRULE
_DIRECTORY;
if (!am_sender || protocol_version >= 30)
if (!am_sender || protocol_version >= 30)
-
flags |= MATCHFLG
_PERISHABLE;
- parse_
rule(&filter_list, partial_dir, flags
, 0);
+
rflags |= FILTRULE
_PERISHABLE;
+ parse_
filter_str(&filter_list, partial_dir, rule_template(rflags)
, 0);
}
}