X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/68ddbaf6457ebaa218587d1a4f9eb90f521174fc..d724dd186ed6a2d66fa13a9357ce91e459d39e8c:/xattrs.c

diff --git a/xattrs.c b/xattrs.c
index 24a01c1a..53363bde 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -3,7 +3,7 @@
  * Written by Jay Fenlason, vaguely based on the ACLs patch.
  *
  * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2006, 2007 Wayne Davison
+ * Copyright (C) 2006-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +47,6 @@ extern int checksum_seed;
 #define XSTATE_ABBREV	0
 #define XSTATE_DONE	1
 #define XSTATE_TODO	2
-#define XSTATE_LOCAL	3
 
 #define USER_PREFIX "user."
 #define UPRE_LEN ((int)sizeof USER_PREFIX - 1)
@@ -63,9 +62,12 @@ extern int checksum_seed;
 #endif
 #define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
 
-#define XSTAT_ATTR RSYNC_PREFIX "%stat"
-#define XACC_ACL_ATTR RSYNC_PREFIX "%aacl"
-#define XDEF_ACL_ATTR RSYNC_PREFIX "%dacl"
+#define XSTAT_SUFFIX "stat"
+#define XSTAT_ATTR RSYNC_PREFIX "%" XSTAT_SUFFIX
+#define XACC_ACL_SUFFIX "aacl"
+#define XACC_ACL_ATTR RSYNC_PREFIX "%" XACC_ACL_SUFFIX
+#define XDEF_ACL_SUFFIX "dacl"
+#define XDEF_ACL_ATTR RSYNC_PREFIX "%" XDEF_ACL_SUFFIX
 
 typedef struct {
 	char *datum, *name;
@@ -112,6 +114,7 @@ static int rsync_xal_compare_names(const void *x1, const void *x2)
 static ssize_t get_xattr_names(const char *fname)
 {
 	ssize_t list_len;
+	double arg;
 
 	if (!namebuf) {
 		namebuf_len = 1024;
@@ -120,39 +123,36 @@ static ssize_t get_xattr_names(const char *fname)
 			out_of_memory("get_xattr_names");
 	}
 
-	/* The length returned includes all the '\0' terminators. */
-	list_len = sys_llistxattr(fname, namebuf, namebuf_len);
-	if (list_len > (ssize_t)namebuf_len) {
-		list_len = -1;
-		errno = ERANGE;
-	}
-	if (list_len >= 0)
-		return list_len;
-	if (errno == ENOTSUP)
-		return 0;
-	if (errno == ERANGE) {
-		list_len = sys_llistxattr(fname, NULL, 0);
-		if (list_len < 0) {
+	while (1) {
+		/* The length returned includes all the '\0' terminators. */
+		list_len = sys_llistxattr(fname, namebuf, namebuf_len);
+		if (list_len >= 0) {
+			if ((size_t)list_len <= namebuf_len)
+				break;
+		} else if (errno == ENOTSUP)
+			return 0;
+		else if (errno != ERANGE) {
+			arg = (double)namebuf_len;
+		  got_error:
 			rsyserr(FERROR_XFER, errno,
-				"get_xattr_names: llistxattr(\"%s\",0) failed",
-				fname);
+				"get_xattr_names: llistxattr(\"%s\",%.0f) failed",
+				fname, arg);
 			return -1;
 		}
+		list_len = sys_llistxattr(fname, NULL, 0);
+		if (list_len < 0) {
+			arg = 0;
+			goto got_error;
+		}
 		if (namebuf_len)
 			free(namebuf);
 		namebuf_len = list_len + 1024;
 		namebuf = new_array(char, namebuf_len);
 		if (!namebuf)
 			out_of_memory("get_xattr_names");
-		list_len = sys_llistxattr(fname, namebuf, namebuf_len);
-		if (list_len >= 0)
-			return list_len;
 	}
 
-	rsyserr(FERROR_XFER, errno,
-		"get_xattr_names: llistxattr(\"%s\",%ld) failed",
-		fname, (long)namebuf_len);
-	return -1;
+	return list_len;
 }
 
 /* On entry, the *len_ptr parameter contains the size of the extra space we
@@ -234,7 +234,10 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
 		if (name_len > RPRE_LEN && name[RPRE_LEN] == '%'
 		 && HAS_PREFIX(name, RSYNC_PREFIX)) {
 			if ((am_sender && preserve_xattrs < 2)
-			 || (am_root < 0 && strcmp(name, XSTAT_ATTR) == 0))
+			 || (am_root < 0
+			  && (strcmp(name+RPRE_LEN+1, XSTAT_SUFFIX) == 0
+			   || strcmp(name+RPRE_LEN+1, XACC_ACL_SUFFIX) == 0
+			   || strcmp(name+RPRE_LEN+1, XDEF_ACL_SUFFIX) == 0)))
 				continue;
 		}
 
@@ -256,14 +259,6 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
 		} else
 			name_offset = datum_len;
 
-#ifdef HAVE_LINUX_XATTRS
-		if (am_root < 0 && name_len > RPRE_LEN && name[RPRE_LEN] != '%'
-		 && HAS_PREFIX(name, RSYNC_PREFIX)) {
-			name += RPRE_LEN;
-			name_len -= RPRE_LEN;
-		}
-#endif
-
 		rxa = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
 		rxa->name = ptr + name_offset;
 		memcpy(rxa->name, name, name_len);
@@ -355,25 +350,33 @@ int send_xattr(stat_x *sxp, int f)
 		int count = sxp->xattr->count;
 		write_varint(f, count);
 		for (rxa = sxp->xattr->items; count--; rxa++) {
+			int name_len = rxa->name_len;
+			const char *name = rxa->name;
+			/* Strip the rsync prefix from disguised namespaces. */
+			if (
 #ifdef HAVE_LINUX_XATTRS
-			write_varint(f, rxa->name_len);
+			    am_root < 0
+#endif
+			 && name_len > RPRE_LEN && name[RPRE_LEN] != '%'
+			 && HAS_PREFIX(name, RSYNC_PREFIX)) {
+				name += RPRE_LEN;
+				name_len -= RPRE_LEN;
+			}
+#ifndef HAVE_LINUX_XATTRS
+			else {
+				/* Put everything else in the user namespace. */
+				name_len += UPRE_LEN;
+			}
+#endif
+			write_varint(f, name_len);
 			write_varint(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_varint(f, rxa->name_len - RPRE_LEN);
-				write_varint(f, rxa->datum_len);
-				write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
-			} else {
-				write_varint(f, rxa->name_len + UPRE_LEN);
-				write_varint(f, rxa->datum_len);
+#ifndef HAVE_LINUX_XATTRS
+			if (name_len > rxa->name_len) {
 				write_buf(f, USER_PREFIX, UPRE_LEN);
-				write_buf(f, rxa->name, rxa->name_len);
+				name_len -= UPRE_LEN;
 			}
 #endif
+			write_buf(f, name, name_len);
 			if (rxa->datum_len > MAX_FULL_DATUM)
 				write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
 			else
@@ -472,9 +475,11 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
 		if (rxa->datum_len <= MAX_FULL_DATUM)
 			continue;
 		switch (rxa->datum[0]) {
-		case XSTATE_LOCAL:
-			/* Items set locally will get cached by receiver. */
-			rxa->datum[0] = XSTATE_DONE;
+		case XSTATE_ABBREV:
+			/* Items left abbreviated matched the sender's checksum, so
+			 * the receiver will cache the local data for future use. */
+			if (am_generator)
+				rxa->datum[0] = XSTATE_DONE;
 			continue;
 		case XSTATE_TODO:
 			break;
@@ -508,27 +513,6 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
 	write_byte(f_out, 0); /* end the list */
 }
 
-/* Any items set locally by the generator that the receiver doesn't
- * get told about get changed back to XSTATE_ABBREV. */
-void xattr_clear_locals(struct file_struct *file)
-{
-	item_list *lst = rsync_xal_l.items;
-	rsync_xa *rxa;
-	int cnt;
-
-	if (F_XATTR(file) < 0)
-		return;
-
-	lst += F_XATTR(file);
-	cnt = lst->count;
-	for (rxa = lst->items; cnt--; rxa++) {
-		if (rxa->datum_len <= MAX_FULL_DATUM)
-			continue;
-		if (rxa->datum[0] == XSTATE_LOCAL)
-			rxa->datum[0] = XSTATE_ABBREV;
-	}
-}
-
 /* When called by the sender, read the request from the generator and mark
  * any needed xattrs with a flag that lets us know they need to be sent to
  * the receiver.  When called by the receiver, reads the sent data and
@@ -596,6 +580,11 @@ void receive_xattr(struct file_struct *file, int f)
 {
 	static item_list temp_xattr = EMPTY_ITEM_LIST;
 	int count, num;
+#ifdef HAVE_LINUX_XATTRS
+	int need_sort = 0;
+#else
+	int need_sort = 1;
+#endif
 	int ndx = read_varint(f);
 
 	if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
@@ -646,6 +635,7 @@ void receive_xattr(struct file_struct *file, int f)
 			name -= RPRE_LEN;
 			name_len += RPRE_LEN;
 			memcpy(name, RSYNC_PREFIX, RPRE_LEN);
+			need_sort = 1;
 		}
 #else
 		/* This OS only has a user namespace, so we either
@@ -677,6 +667,9 @@ void receive_xattr(struct file_struct *file, int f)
 		rxa->num = num;
 	}
 
+	if (need_sort && count > 1)
+		qsort(temp_xattr.items, count, sizeof (rsync_xa), rsync_xal_compare_names);
+
 	ndx = rsync_xal_l.count; /* pre-incremented count */
 	rsync_xal_store(&temp_xattr); /* adds item to rsync_xal_l */
 
@@ -751,8 +744,6 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 				sxp->st.st_mtime = (time_t)-1;
 
 			if (am_generator) { /* generator items stay abbreviated */
-				if (rxas[i].datum[0] == XSTATE_ABBREV)
-					rxas[i].datum[0] = XSTATE_LOCAL;
 				free(ptr);
 				continue;
 			}