LineageOS/android_external_rsync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some changes to allow an unsorted file list even if the iconv option

Browse Source 
was disabled via configure.
This commit is contained in:
Wayne Davison
2007-11-06 15:25:02 +00:00
parent 84e1a34eaa
commit f7a76b9c45
6 changed files with 21 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compat.c
View File

@@ -54,16 +54,15 @@ 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 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;
#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
@@ -247,10 +246,8 @@ void setup_protocol(int f_out,int f_in)
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;