diff options
| author | Wayne Davison <wayned@samba.org> | 2007-07-02 21:35:14 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-07-02 21:35:14 +0000 |
| commit | 524eaa8245e3d9314055759403ead1fee9e136cc (patch) | |
| tree | 926ff9267d76d8a9cbc3d1489ef8b0da36ed46c5 /xattrs.c | |
| parent | 9742b386b3d5b3010675aef9febaffbf8ab2d2c0 (diff) | |
| download | android_external_rsync-524eaa8245e3d9314055759403ead1fee9e136cc.tar.gz android_external_rsync-524eaa8245e3d9314055759403ead1fee9e136cc.tar.bz2 android_external_rsync-524eaa8245e3d9314055759403ead1fee9e136cc.zip | |
We omit copying any user-space rsync.%FOO attributes unless the
user specified -X twice.
Diffstat (limited to 'xattrs.c')
| -rw-r--r-- | xattrs.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -30,6 +30,7 @@ extern int am_sender; extern int am_generator; extern int read_only; extern int list_only; +extern int preserve_xattrs; extern int checksum_seed; #define RSYNC_XAL_INITIAL 5 @@ -62,7 +63,6 @@ extern int checksum_seed; #define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1) #define XSTAT_ATTR RSYNC_PREFIX "%stat" -#define XSTAT_LEN ((int)sizeof XSTAT_ATTR - 1) typedef struct { char *datum, *name; @@ -223,8 +223,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp) continue; #endif - if (am_root < 0 && name_len == XSTAT_LEN + 1 - && name[RPRE_LEN] == '%' && strcmp(name, XSTAT_ATTR) == 0) + /* No rsync.%FOO attributes are copied w/o 2 -X options. */ + if (preserve_xattrs < 2 && name_len > RPRE_LEN + && name[RPRE_LEN] == '%' && HAS_PREFIX(name, RSYNC_PREFIX)) continue; datum_len = name_len; /* Pass extra size to get_xattr_data() */ @@ -636,8 +637,9 @@ void receive_xattr(struct file_struct *file, int f) continue; } #endif - if (am_root < 0 && name_len == XSTAT_LEN + 1 - && name[RPRE_LEN] == '%' && strcmp(name, XSTAT_ATTR) == 0) { + /* No rsync.%FOO attributes are copied w/o 2 -X options. */ + if (preserve_xattrs < 2 && name_len > RPRE_LEN + && name[RPRE_LEN] == '%' && HAS_PREFIX(name, RSYNC_PREFIX)) { free(ptr); continue; } |