aboutsummaryrefslogtreecommitdiffstats
path: root/flist.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-01-03 08:53:59 -0800
committerWayne Davison <wayned@samba.org>2009-01-03 08:53:59 -0800
commit09ca0d15d31d93a5964a1db4c387879f31c22831 (patch)
treea966cbf8f02b8796d5c8d9f66e3c533ad97a4b41 /flist.c
parentc43c66125e8fd35896a358ccce9687ebcfe82dc5 (diff)
downloadandroid_external_rsync-09ca0d15d31d93a5964a1db4c387879f31c22831.tar.gz
android_external_rsync-09ca0d15d31d93a5964a1db4c387879f31c22831.tar.bz2
android_external_rsync-09ca0d15d31d93a5964a1db4c387879f31c22831.zip
Added init_stat_x() to avoid duplication of acl/xattr init code.
Diffstat (limited to 'flist.c')
-rw-r--r--flist.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/flist.c b/flist.c
index e86b57a2..84420c0b 100644
--- a/flist.c
+++ b/flist.c
@@ -1378,6 +1378,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
#endif
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
stat_x sx;
+ init_stat_x(&sx);
#endif
#ifdef SUPPORT_LINKS
@@ -1441,7 +1442,6 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
sx.st.st_mode = file->mode;
- sx.acc_acl = sx.def_acl = NULL;
if (get_acl(fname, &sx) < 0) {
io_error |= IOERR_GENERAL;
return NULL;
@@ -1450,7 +1450,6 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
#endif
#ifdef SUPPORT_XATTRS
if (preserve_xattrs) {
- sx.xattr = NULL;
if (get_xattr(fname, &sx) < 0) {
io_error |= IOERR_GENERAL;
return NULL;