diff options
| author | Wayne Davison <wayned@samba.org> | 2011-03-26 10:17:14 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2011-03-26 10:19:04 -0700 |
| commit | 0de515756468e0b8f87f3f24ae5351aee8cd3a69 (patch) | |
| tree | 76f0f5547eb3ad7f8d399a41205b9a180829ae3d /generator.c | |
| parent | 78286a03d196efeed754aa4c1faa571f5dbea342 (diff) | |
| download | android_external_rsync-0de515756468e0b8f87f3f24ae5351aee8cd3a69.tar.gz android_external_rsync-0de515756468e0b8f87f3f24ae5351aee8cd3a69.tar.bz2 android_external_rsync-0de515756468e0b8f87f3f24ae5351aee8cd3a69.zip | |
Tweak dir xattrs after the writability fudging.
Diffstat (limited to 'generator.c')
| -rw-r--r-- | generator.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/generator.c b/generator.c index e3890bb1..326ccd88 100644 --- a/generator.c +++ b/generator.c @@ -1353,13 +1353,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, goto cleanup; } } -#ifdef SUPPORT_XATTRS - if (preserve_xattrs && statret == 1) - copy_xattrs(fnamecmpbuf, fname); -#endif - if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) - && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1) - rprintf(code, "%s/\n", fname); /* We need to ensure that the dirs in the transfer have writable * permissions during the time we are putting files within them. @@ -1376,6 +1369,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } #endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs && statret == 1) + copy_xattrs(fnamecmpbuf, fname); +#endif + if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) + && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1) + rprintf(code, "%s/\n", fname); + if (real_ret != 0 && one_file_system) real_sx.st.st_dev = filesystem_dev; if (inc_recurse) { |