}
--- old/lib/sysxattr.c
+++ new/lib/sysxattr.c
-@@ -0,0 +1,136 @@
+@@ -0,0 +1,135 @@
+/*
+ * Extended attribute support for rsync.
+ *
+ * terminator. We need to change this into a series of null-terminted
+ * strings. Since the size is the same, we can simply transform the
+ * output in place. */
-+ for (off = 0; off < len; ) {
++ for (off = 0; off < len; off += keylen + 1) {
+ keylen = ((unsigned char*)list)[off];
+ if (off + keylen >= len) {
+ /* Should be impossible, but kernel bugs happen! */
+ return -1;
+ }
+ memmove(list+off, list+off+1, keylen);
-+ off += keylen;
-+ list[off++] = '\0';
++ list[off+keylen] = '\0';
+ }
+
+ return len;
transfer. The resulting value is treated as though it was the permissions
--- old/xattr.c
+++ new/xattr.c
-@@ -0,0 +1,393 @@
+@@ -0,0 +1,415 @@
+/*
+ * Extended Attribute support for rsync.
+ * Written by Jay Fenlason, vaguely based on the ACLs patch.
+#define RSYNC_XAL_INITIAL 5
+#define RSYNC_XAL_LIST_INITIAL 100
+
++#define HAS_PREFIX(str, prfx) (*(str) == *(prfx) \
++ && strncmp(str, prfx, sizeof (prfx) - 1) == 0)
++
+#define USER_PREFIX "user."
-+#define UPRE_LEN (sizeof USER_PREFIX - 1)
-+#define ROOT_PREFIX "root."
-+#define RPRE_LEN (sizeof ROOT_PREFIX - 1)
++#define UPRE_LEN ((int)sizeof USER_PREFIX - 1)
++#define SYSTEM_PREFIX "system."
++#define SPRE_LEN ((int)sizeof SYSTEM_PREFIX - 1)
++
++#ifdef HAVE_LINUX_XATTRS
++#define RPRE_LEN 0
++#else
++#define RSYNC_PREFIX "rsync."
++#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
++#endif
+
+typedef struct {
-+ char *name;
-+ char *datum;
-+ size_t name_len;
-+ size_t datum_len;
++ char *datum, *name;
++ size_t datum_len, name_len;
+} rsync_xa;
+
+static size_t namebuf_len = 0;
+ rsync_xa *rxas = xalp->items;
+
+ for (i = 0; i < xalp->count; i++) {
-+ free(rxas[i].name);
-+ /* free(rxas[i].value); */
++ free(rxas[i].datum);
++ /*free(rxas[i].name);*/
+ }
+ xalp->count = 0;
+}
+
+static int rsync_xal_get(const char *fname, item_list *xalp)
+{
-+ ssize_t name_size;
-+ ssize_t datum_size;
-+ ssize_t left;
-+ char *name;
-+ size_t len;
-+ char *ptr;
++ ssize_t list_len, name_len, datum_len;
++ char *name, *ptr;
+
+ if (!namebuf) {
+ namebuf_len = 1024;
+ }
+
+ /* The length returned includes all the '\0' terminators. */
-+ name_size = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (name_size > (ssize_t)namebuf_len) {
-+ name_size = -1;
++ list_len = sys_llistxattr(fname, namebuf, namebuf_len);
++ if (list_len > (ssize_t)namebuf_len) {
++ list_len = -1;
+ errno = ERANGE;
+ }
-+ if (name_size < 0) {
++ if (list_len < 0) {
+ if (errno == ENOTSUP)
+ return 0;
+ if (errno == ERANGE) {
-+ name_size = sys_llistxattr(fname, NULL, 0);
-+ if (name_size < 0) {
-+ rsyserr(FERROR, errno, "%s: rsync_xal_get: llistxattr",
++ list_len = sys_llistxattr(fname, NULL, 0);
++ if (list_len < 0) {
++ rsyserr(FERROR, errno,
++ "rsync_xal_get: llistxattr(\"%s\",0) failed",
+ fname);
+ return -1;
+ }
-+ namebuf = realloc_array(namebuf, char, name_size + 1024);
++ namebuf = realloc_array(namebuf, char, list_len + 1024);
+ if (!namebuf)
+ out_of_memory("rsync_xal_get");
-+ namebuf_len = name_size + 1024;
-+ name_size = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (name_size < 0) {
++ namebuf_len = list_len + 1024;
++ list_len = sys_llistxattr(fname, namebuf, namebuf_len);
++ if (list_len < 0) {
+ rsyserr(FERROR, errno,
-+ "%s: rsync_xal_get: re-llistxattr failed",
-+ fname);
++ "rsync_xal_get: llistxattr(\"%s\",%ld) failed",
++ fname, (long)namebuf_len);
+ return -1;
+ }
+ } else {
+ rsyserr(FERROR, errno,
-+ "%s: rsync_xal_get: llistxattr failed:",
-+ fname);
++ "rsync_xal_get: llistxattr(\"%s\",%ld) failed",
++ fname, (long)namebuf_len);
+ return -1;
+ }
+ }
-+ if (name_size == 0)
-+ return 0;
-+ for (left = name_size, name = namebuf; left > 0 ; left -= len, name += len) {
++
++ for (name = namebuf; list_len > 0; name += name_len) {
+ rsync_xa *rxas;
+
-+ len = strlen(name) + 1;
++ name_len = strlen(name) + 1;
++ list_len -= name_len;
+
+#ifdef HAVE_LINUX_XATTRS
-+ /* We only send user and root namespaces. */
-+ if (strncmp(name, USER_PREFIX, UPRE_LEN) != 0
-+ && strncmp(name, ROOT_PREFIX, RPRE_LEN) != 0)
++ /* We don't send the system namespace. */
++ if (HAS_PREFIX(name, SYSTEM_PREFIX))
+ continue;
+#endif
+
-+ rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
-+
-+ datum_size = sys_lgetxattr(fname, name, NULL, 0);
-+ if (datum_size < 0) {
++ datum_len = sys_lgetxattr(fname, name, NULL, 0);
++ if (datum_len < 0) {
+ if (errno == ENOTSUP)
+ return -1;
+ rsyserr(FERROR, errno,
-+ "%s: rsync_xal_get: lgetxattr %s failed",
++ "rsync_xal_get: lgetxattr(\"%s\",\"%s\",0) failed",
+ fname, name);
+ return -1;
+ }
-+ ptr = new_array(char, len + datum_size);
++ ptr = new_array(char, name_len + datum_len);
+ if (!ptr)
+ out_of_memory("rsync_xal_get");
-+ memcpy(ptr, name, len);
-+ rxas->name_len = len;
-+ rxas->name = ptr;
-+ rxas->datum_len = datum_size;
-+ rxas->datum = ptr + len;
-+ if (datum_size) {
-+ ssize_t size = sys_lgetxattr(fname, name, rxas->datum, datum_size);
-+ if (size != datum_size) {
-+ if (size < 0) {
++ if (datum_len) {
++ ssize_t len = sys_lgetxattr(fname, name, ptr, datum_len);
++ if (len != datum_len) {
++ if (len < 0) {
+ rsyserr(FERROR, errno,
-+ "rsync_xal_get: lgetxattr(%s,%s)"
-+ " failed", fname, name);
++ "rsync_xal_get: lgetxattr(\"%s\",\"%s\",%ld)"
++ " failed", fname, name, (long)datum_len);
+ } else {
+ rprintf(FERROR,
-+ "rsync_xal_get: lgetxattr(%s,%s)"
-+ " returned %ld instead of %ld\n",
-+ fname, name,
-+ (long)size, (long)datum_size);
++ "rsync_xal_get: lgetxattr(\"%s\",\"%s\",%ld)"
++ " returned %ld\n", fname, name,
++ (long)datum_len, (long)len);
+ }
++ free(ptr);
+ return -1;
+ }
+ }
++ rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
++ rxas->name = ptr + datum_len;
++ rxas->datum = ptr;
++ rxas->name_len = name_len;
++ rxas->datum_len = datum_len;
++ memcpy(rxas->name, name, name_len);
+ }
+ if (xalp->count > 1)
+ qsort(xalp->items, xalp->count, sizeof (rsync_xa), rsync_xal_compare_names);
+ write_byte(f, 'X');
+ write_int(f, count);
+ for (rxa = sxp->xattr->items; count--; rxa++) {
-+#ifndef HAVE_LINUX_XATTRS
-+ /* This OS only sends the user namespace, so we may have
-+ * stored a root namespace from Linux in user space. */
-+ if (strncmp(ptr, ROOT_PREFIX, RPRE_LEN) != 0) {
++#ifdef HAVE_LINUX_XATTRS
++ write_int(f, rxa->name_len);
++ write_int(f, rxa->datum_len);
++ write_buf(f, rxa->name, rxa->name_len);
++#else
++ /* We strip the rsync prefix from disguised namespaces
++ * and put everything else in the user namespace. */
++ if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)
++ && rxa->name[RPRE_LEN] != '%') {
++ write_int(f, rxa->name_len - RPRE_LEN);
++ write_int(f, rxa->datum_len);
++ write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
++ } else {
+ write_int(f, rxa->name_len + UPRE_LEN);
+ write_int(f, rxa->datum_len);
+ write_buf(f, USER_PREFIX, UPRE_LEN);
-+ } else
-+#endif
-+ {
-+ write_int(f, rxa->name_len);
-+ write_int(f, rxa->datum_len);
++ write_buf(f, rxa->name, rxa->name_len);
+ }
-+ write_buf(f, rxa->name, rxa->name_len);
++#endif
+ write_buf(f, rxa->datum, rxa->datum_len);
+ }
+ rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
+void receive_xattr(struct file_struct *file, int f)
+{
+ static item_list temp_xattr = EMPTY_ITEM_LIST;
-+ int tag = read_byte(f);
+ char *ndx_ptr = (char*)file + file_struct_len;
-+ int ndx;
++ int ndx, tag = read_byte(f);
+
+ if (tag == 'X') {
+ int i, count = read_int(f);
+ for (i = 0; i < count; i++) {
-+ char *ptr;
++ char *ptr, *name;
+ rsync_xa *rxa;
+ size_t name_len = read_int(f);
+ size_t datum_len = read_int(f);
-+ if (name_len + datum_len < name_len)
++ size_t extra_len = am_root < 0 ? RPRE_LEN : 0;
++#ifndef HAVE_LINUX_XATTRS
++ if (datum_len + extra_len < datum_len)
+ out_of_memory("receive_xattr"); /* overflow */
-+ rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
-+ ptr = new_array(char, name_len + datum_len);
++#endif
++ 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);
+ if (!ptr)
+ out_of_memory("receive_xattr");
-+ read_buf(f, ptr, name_len);
-+ read_buf(f, ptr + name_len, datum_len);
-+ rxa->name_len = name_len;
-+ rxa->datum_len = datum_len;
-+ rxa->name = ptr;
-+ rxa->datum = ptr + name_len;
++ name = ptr + datum_len + extra_len;
++ read_buf(f, name, name_len);
++ read_buf(f, ptr, datum_len);
+#ifdef HAVE_LINUX_XATTRS
-+ if (!am_root && strncmp(ptr, ROOT_PREFIX, RPRE_LEN) == 0) {
-+ temp_xattr.count--;
++ /* Non-root can only save the user namespace. */
++ if (!am_root && !HAS_PREFIX(name, USER_PREFIX)) {
+ free(ptr);
+ continue;
+ }
+#else
-+ if (strncmp(ptr, USER_PREFIX, UPRE_LEN) == 0) {
-+ rxa->name_len -= UPRE_LEN;
-+ memmove(ptr, ptr + UPRE_LEN, rxa->name_len);
++ /* This OS only has a user namespace, so we either
++ * strip the user prefix, or we put a non-user
++ * namespace inside our rsync hierarchy. */
++ if (HAS_PREFIX(name, USER_PREFIX)) {
++ name += UPRE_LEN;
++ name_len -= UPRE_LEN;
++ } else if (am_root) {
++ name -= RPRE_LEN;
++ name_len += RPRE_LEN;
++ memcpy(name, RSYNC_PREFIX, RPRE_LEN);
++ } else {
++ free(ptr);
++ continue;
+ }
+#endif
++ rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
++ rxa->name = name;
++ rxa->datum = ptr;
++ rxa->name_len = name_len;
++ rxa->datum_len = datum_len;
+ }
+ ndx = rsync_xal_l.count; /* pre-incremented count */
+ rsync_xal_store(&temp_xattr); /* adds item to rsync_xal_l */
+ } else if (tag == 'x') {
+ ndx = read_int(f);
+ if (ndx < 0 || (size_t)ndx >= rsync_xal_l.count) {
-+ rprintf(FERROR, "%s: receive_xattr: xa index %d out of range\n",
-+ f_name(file, NULL), ndx);
++ rprintf(FERROR, "receive_xattr: xa index %d out of"
++ " range for %s\n", ndx, f_name(file, NULL));
+ exit_cleanup(RERR_STREAMIO);
+ }
+ } else {
-+ rprintf(FERROR,
-+ "%s: receive_xattr: unknown extended attribute type tag: %c\n",
-+ f_name(file, NULL), tag);
++ rprintf(FERROR, "receive_xattr: unknown extended attribute"
++ " type tag (%c) for %s\n", tag, f_name(file, NULL));
+ exit_cleanup(RERR_STREAMIO);
-+ ndx = 0; /* silence a compiler warning... */
+ }
+
+ SIVAL(ndx_ptr, 0, ndx);
+ for (i = 0; i < xalp->count; i++) {
+ int status = sys_lsetxattr(fname, rxas[i].name, rxas[i].datum, rxas[i].datum_len);
+ if (status < 0) {
-+ rsyserr(FERROR, errno, "%s: rsync_xal_set: lsetxattr %s failed",
++ rsyserr(FERROR, errno,
++ "rsync_xal_set: lsetxattr(\"%s\",\"%s\") failed",
+ fname, rxas[i].name);
+ ret = -1;
+ }
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff