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 improvements to the solaris xattr routines.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
2af7e88
..
7208efa
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-79,8
+79,8
@@
extern char curr_dir[MAXPATHLEN];
extern struct chmod_mode_struct *chmod_modes;
extern struct chmod_mode_struct *chmod_modes;
-extern
struct filter_list_struc
t filter_list;
-extern
struct filter_list_struc
t daemon_filter_list;
+extern
filter_rule_lis
t filter_list;
+extern
filter_rule_lis
t daemon_filter_list;
#ifdef ICONV_OPTION
extern int filesfrom_convert;
#ifdef ICONV_OPTION
extern int filesfrom_convert;
@@
-1476,6
+1476,7
@@
static struct file_struct *send_file_name(int f, struct file_list *flist,
#endif
#ifdef SUPPORT_XATTRS
if (preserve_xattrs) {
#endif
#ifdef SUPPORT_XATTRS
if (preserve_xattrs) {
+ sx.st.st_mode = file->mode;
if (get_xattr(fname, &sx) < 0) {
io_error |= IOERR_GENERAL;
return NULL;
if (get_xattr(fname, &sx) < 0) {
io_error |= IOERR_GENERAL;
return NULL;
@@
-1743,7
+1744,7
@@
static void send_implied_dirs(int f, struct file_list *flist, char *fname,
item_list *relname_list;
relnamecache **rnpp;
int len, need_new_dir, depth = 0;
item_list *relname_list;
relnamecache **rnpp;
int len, need_new_dir, depth = 0;
-
struct filter_list_struc
t save_filter_list = filter_list;
+
filter_rule_lis
t save_filter_list = filter_list;
flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
filter_list.head = filter_list.tail = NULL; /* Don't filter implied dirs. */
flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
filter_list.head = filter_list.tail = NULL; /* Don't filter implied dirs. */