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
Mention the number of child args.
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
787e289
..
45073d3
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;
@@
-32,6
+34,7
@@
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 preallocate_files;
extern int append_mode;
extern int fuzzy_basis;
extern int read_batch;
extern int append_mode;
extern int fuzzy_basis;
extern int read_batch;
@@
-52,7
+55,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
+75,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;
@@
-186,6
+190,14
@@
void setup_protocol(int f_out,int f_in)
if (read_batch)
check_batch_flags();
if (read_batch)
check_batch_flags();
+#ifndef SUPPORT_PREALLOCATION
+ if (preallocate_files && !am_sender) {
+ rprintf(FERROR, "preallocation is not supported on this %s\n",
+ am_server ? "Server" : "Client");
+ exit_cleanup(RERR_SYNTAX);
+ }
+#endif
+
if (protocol_version < 30) {
if (append_mode == 1)
append_mode = 2;
if (protocol_version < 30) {
if (append_mode == 1)
append_mode = 2;
@@
-245,15
+257,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,7
+277,7
@@
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
else
receiver_symlink_times = 1;
#endif
@@
-280,8
+293,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
@@
-294,7
+308,7
@@
void setup_protocol(int f_out,int f_in)
int rflags = FILTRULE_NO_PREFIXES | FILTRULE_DIRECTORY;
if (!am_sender || protocol_version >= 30)
rflags |= FILTRULE_PERISHABLE;
int rflags = FILTRULE_NO_PREFIXES | FILTRULE_DIRECTORY;
if (!am_sender || protocol_version >= 30)
rflags |= FILTRULE_PERISHABLE;
- parse_
rule(&filter_list, partial_dir, rflags
, 0);
+ parse_
filter_str(&filter_list, partial_dir, rule_template(rflags)
, 0);
}
}