Attachment 11780 Details for Bug 6590 – Concept patch

[patch] Concept patch

0001-Fix-bug-of-xattrs-and-fake-super.patch (text/plain), 1.47 KB, created by SATOH Fumiyasu on 2016-01-15 14:55:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: SATOH Fumiyasu

Created: 2016-01-15 14:55:09 UTC

Size: 1.47 KB

patch

obsolete

>From ecc443d51c91a7880c73b9fc53258f271836fb8c Mon Sep 17 00:00:00 2001
>From: SATOH Fumiyasu <fumiyas@osstech.co.jp>
>Date: Fri, 15 Jan 2016 23:39:27 +0900
>Subject: [PATCH] Fix bug of --xattrs and --fake-super
>
>Fixes bug 6590.
>---
> xattrs.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/xattrs.c b/xattrs.c
>index 57833e5..7c1488c 100644
>--- a/xattrs.c
>+++ b/xattrs.c
>@@ -597,8 +597,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
> {
> 	item_list *lst = rsync_xal_l.items;
> 	char *old_datum, *name;
>+	rsync_xa *rxas;
> 	rsync_xa *rxa;
>-	int rel_pos, cnt, num, got_xattr_data = 0;
>+	int i, rel_pos, cnt, num, got_xattr_data = 0;
> 
> 	if (F_XATTR(file) < 0) {
> 		rprintf(FERROR, "recv_xattr_request: internal data error!\n");
>@@ -606,16 +607,21 @@ int recv_xattr_request(struct file_struct *file, int f_in)
> 	}
> 	lst += F_XATTR(file);
> 
>-	cnt = lst->count;
>-	rxa = lst->items;
>+	i = 0;
>+	rxas = lst->items;
> 	num = 0;
> 	while ((rel_pos = read_varint(f_in)) != 0) {
>+		cnt = lst->count;
> 		num += rel_pos;
> 		/* Note that the sender-related num values may not be in order on the receiver! */
>-		while (cnt && (am_sender ? rxa->num < num : rxa->num != num)) {
>-			rxa++;
>+		while (cnt && rxas[i].num != num) {
>+			i++;
> 			cnt--;
>+			if (i == (int)lst->count) {
>+				i = 0;
>+			}
> 		}
>+		rxa = rxas + i;
> 		if (!cnt || rxa->num != num) {
> 			rprintf(FERROR, "[%s] could not find xattr #%d for %s\n",
> 				who_am_i(), num, f_name(file, NULL));
>-- 
>2.7.0.rc3
>

Actions: View

Attachments on bug 6590: 11780