int preserve_perms = 0;
--- old/xattr.c
+++ new/xattr.c
-@@ -39,13 +39,24 @@ extern unsigned int file_struct_len;
- #define SYSTEM_PREFIX "system."
+@@ -43,11 +43,16 @@ extern unsigned int file_struct_len;
#define SPRE_LEN ((int)sizeof SYSTEM_PREFIX - 1)
-+#define RSYNC_PREFIX "rsync."
-+#define XSTAT_SUFFIX "%stat"
-+
#ifdef HAVE_LINUX_XATTRS
- #define RPRE_LEN 0
-+#define FAKE_PREFIX USER_PREFIX RSYNC_PREFIX
-+#define FPRE_LEN ((int)sizeof FAKE_PREFIX - 1)
-+#define XSTAT_ATTR USER_PREFIX RSYNC_PREFIX XSTAT_SUFFIX
-+#define CENT_POS (UPRE_LEN + (int)sizeof RSYNC_PREFIX - 1)
+-#define RPRE_LEN 0
++#define RSYNC_PREFIX USER_PREFIX "rsync."
#else
--#define RSYNC_PREFIX "rsync."
- #define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
-+#define FPRE_LEN 0
-+#define XSTAT_ATTR RSYNC_PREFIX XSTAT_SUFFIX
-+#define CENT_POS RPRE_LEN
+ #define RSYNC_PREFIX "rsync."
+-#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
#endif
-
++#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
++
++#define XSTAT_ATTR RSYNC_PREFIX "%stat"
+#define XSTAT_LEN ((int)sizeof XSTAT_ATTR - 1)
+
++#define CENT_POS RPRE_LEN
+
typedef struct {
char *datum, *name;
- size_t datum_len, name_len;
-@@ -143,6 +154,10 @@ static int rsync_xal_get(const char *fna
+@@ -148,6 +153,10 @@ static int rsync_xal_get(const char *fna
continue;
#endif
-+ if (am_root < 0 && name_len == XSTAT_LEN
++ if (am_root < 0 && name_len == XSTAT_LEN + 1
+ && name[CENT_POS] == '%' && strcmp(name, XSTAT_ATTR) == 0)
+ continue;
+
datum_len = sys_lgetxattr(fname, name, NULL, 0);
if (datum_len < 0) {
if (errno == ENOTSUP)
-@@ -173,6 +188,13 @@ static int rsync_xal_get(const char *fna
+@@ -177,6 +186,13 @@ static int rsync_xal_get(const char *fna
return -1;
}
}
+#ifdef HAVE_LINUX_XATTRS
-+ if (am_root < 0 && name_len > FPRE_LEN
-+ && strncmp(name, FAKE_PREFIX, FPRE_LEN) == 0) {
-+ name += FPRE_LEN;
-+ name_len -= FPRE_LEN;
++ if (am_root < 0 && name_len > RPRE_LEN
++ && HAS_PREFIX(name, RSYNC_PREFIX)) {
++ name += RPRE_LEN;
++ name_len -= RPRE_LEN;
+ }
+#endif
rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
rxas->name = ptr + datum_len;
rxas->datum = ptr;
-@@ -293,20 +315,23 @@ void receive_xattr(struct file_struct *f
- rsync_xa *rxa;
+@@ -299,10 +315,8 @@ void receive_xattr(struct file_struct *f
size_t name_len = read_int(f);
size_t datum_len = read_int(f);
-+ size_t extra_len = am_root < 0 ? FPRE_LEN + RPRE_LEN : RPRE_LEN;
- if (name_len + datum_len < name_len)
- out_of_memory("receive_xattr"); /* overflow */
+ size_t extra_len = am_root < 0 ? RPRE_LEN : 0;
-#ifndef HAVE_LINUX_XATTRS
-- if (name_len + datum_len + RPRE_LEN < RPRE_LEN)
-+ if (name_len + datum_len + extra_len < extra_len)
+ if (datum_len + extra_len < datum_len)
out_of_memory("receive_xattr"); /* overflow */
-#endif
-- ptr = new_array(char, name_len + datum_len + RPRE_LEN);
-+ ptr = new_array(char, name_len + datum_len + extra_len);
- if (!ptr)
- out_of_memory("receive_xattr");
-- name = ptr + datum_len + RPRE_LEN;
-+ name = ptr + datum_len + extra_len;
- read_buf(f, name, name_len);
+ if (name_len + datum_len + extra_len < name_len)
+ out_of_memory("receive_xattr"); /* overflow */
+ ptr = new_array(char, name_len + datum_len + extra_len);
+@@ -313,6 +327,10 @@ void receive_xattr(struct file_struct *f
read_buf(f, ptr, datum_len);
#ifdef HAVE_LINUX_XATTRS
/* Non-root can only save the user namespace. */
-+ if (am_root < 0 && strncmp(name, USER_PREFIX, UPRE_LEN) != 0) {
-+ name -= FPRE_LEN;
-+ memcpy(name, FAKE_PREFIX, FPRE_LEN);
++ if (am_root < 0 && !HAS_PREFIX(name, USER_PREFIX)) {
++ name -= RPRE_LEN;
++ memcpy(name, RSYNC_PREFIX, RPRE_LEN);
+ } else
- if (!am_root && strncmp(name, USER_PREFIX, UPRE_LEN) != 0) {
+ if (!am_root && !HAS_PREFIX(name, USER_PREFIX)) {
free(ptr);
continue;
-@@ -324,6 +349,11 @@ void receive_xattr(struct file_struct *f
- memcpy(name, RSYNC_PREFIX, RPRE_LEN);
+@@ -333,6 +351,11 @@ void receive_xattr(struct file_struct *f
+ continue;
}
#endif
-+ if (am_root < 0 && name_len == XSTAT_LEN
++ if (am_root < 0 && name_len == XSTAT_LEN + 1
+ && name[CENT_POS] == '%' && strcmp(name, XSTAT_ATTR) == 0) {
+ free(ptr);
+ continue;
rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
rxa->name = name;
rxa->datum = ptr;
-@@ -403,4 +433,146 @@ int set_xattr(const char *fname, const s
+@@ -412,4 +435,149 @@ int set_xattr(const char *fname, const s
return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */
}
+{
+ STRUCT_STAT fst, xst;
+ dev_t rdev;
-+ mode_t mode;
++ mode_t mode, fmode;
+
+ if (dry_run)
+ return 0;
+ return -1;
+ }
+
-+ if (IS_DEVICE(file->mode) || IS_SPECIAL(file->mode))
++ fst.st_mode &= (_S_IFMT | CHMOD_BITS);
++ fmode = file->mode & (_S_IFMT | CHMOD_BITS);
++
++ if (IS_DEVICE(fmode) || IS_SPECIAL(fmode))
+ rdev = file->u.rdev;
+ else
+ rdev = 0;
+
+ /* Dump the special permissions and enable full owner access. */
-+ mode = (fst.st_mode & ~CHMOD_BITS) | (file->mode & ACCESSPERMS)
++ mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
+ | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
+ if (fst.st_mode != mode)
+ do_chmod(fname, mode);
+ if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode))
+ fst.st_rdev = 0; /* just in case */
+
-+ if (mode == file->mode && fst.st_rdev == rdev
++ if (mode == fmode && fst.st_rdev == rdev
+ && fst.st_uid == file->uid && fst.st_gid == file->gid) {
+ /* xst.st_mode will be 0 if there's no current stat xattr */
+ if (xst.st_mode && sys_lremovexattr(fname, XSTAT_ATTR) < 0) {
+ return 0;
+ }
+
-+ if (xst.st_mode != file->mode || xst.st_rdev != rdev
++ if (xst.st_mode != fmode || xst.st_rdev != rdev
+ || xst.st_uid != file->uid || xst.st_gid != file->gid) {
+ char buf[256];
+ int len = snprintf(buf, sizeof buf, "%o %u,%u %u:%u",
-+ to_wire_mode(file->mode) & (_S_IFMT|CHMOD_BITS),
++ to_wire_mode(fmode),
+ (int)major(rdev), (int)minor(rdev),
+ (int)file->uid, (int)file->gid);
+ if (sys_lsetxattr(fname, XSTAT_ATTR, buf, len) < 0) {
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff