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
Some minor tweaks:
[rsync/rsync.git]
/
compat.c
diff --git
a/compat.c
b/compat.c
index
888f94d
..
c958135
100644
(file)
--- a/
compat.c
+++ b/
compat.c
@@
-54,16
+54,15
@@
extern char *dest_option;
extern char *files_from;
extern char *filesfrom_host;
extern struct filter_list_struct filter_list;
extern char *files_from;
extern char *filesfrom_host;
extern struct filter_list_struct filter_list;
+extern int need_unsorted_flist;
#ifdef ICONV_OPTION
#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. */
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;
-#ifdef ICONV_OPTION
-int ic_ndx;
+int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+#ifdef ICONV_OPTION
int filesfrom_convert = 0;
#endif
int filesfrom_convert = 0;
#endif
@@
-232,11
+231,12
@@
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) {
+ /* The inc_recurse var MUST be set to 0 or 1. */
if (am_server) {
if (am_server) {
- inc_recurse = allow_inc_recurse;
+ inc_recurse = allow_inc_recurse
? 1 : 0
;
write_byte(f_out, inc_recurse);
} else
write_byte(f_out, inc_recurse);
} else
- inc_recurse = read_byte(f_in);
+ inc_recurse = read_byte(f_in)
? 1 : 0
;
if (inc_recurse && !allow_inc_recurse) {
/* This should only be able to happen in a batch. */
fprintf(stderr,
if (inc_recurse && !allow_inc_recurse) {
/* This should only be able to happen in a batch. */
fprintf(stderr,
@@
-247,10
+247,8
@@
void setup_protocol(int f_out,int f_in)
need_messages_from_generator = 1;
}
need_messages_from_generator = 1;
}
-#ifdef ICONV_OPTION
- if (iconv_opt && (!am_sender || inc_recurse))
- ic_ndx = ++file_extra_cnt;
-#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 (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;