Attachment 148328 Details for Bug 200623 – attr -l works fine with the patch

[patch] attr -l works fine with the patch

list_attr.patch (text/plain), 1.78 KB, created by Sergey Satskiy on 2007-02-19 16:33:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Satskiy

Created: 2007-02-19 16:33:48 UTC

Size: 1.78 KB

patch

obsolete

>--- libattr/libattr.c.orig	2007-02-19 19:08:35.000000000 +0300
>+++ libattr/libattr.c	2007-02-19 19:30:01.000000000 +0300
>@@ -268,7 +268,7 @@
> 	  attrlist_cursor_t *cursor)
> {
> 	const char *l;
>-	int length, count = 0;
>+	int names_length, length, count = 0;
> 	char lbuf[MAXLISTLEN];
> 	char name[MAXNAMELEN+16];
> 	unsigned int start_offset, end_offset;
>@@ -280,16 +280,16 @@
> 	bzero(buffer, sizeof(attrlist_t));
> 
> 	if (flags & ATTR_DONTFOLLOW)
>-		length = llistxattr(path, lbuf, sizeof(lbuf));
>+		names_length = llistxattr(path, lbuf, sizeof(lbuf));
> 	else
>-		length = listxattr(path, lbuf, sizeof(lbuf));
>-	if (length <= 0)
>-		return length;
>+		names_length = listxattr(path, lbuf, sizeof(lbuf));
>+	if (names_length <= 0)
>+		return names_length;
> 
> 	start_offset = sizeof(attrlist_t);
> 	end_offset = buffersize & ~(8-1);	/* 8 byte align */
> 
>-	for (l = lbuf; l != lbuf + length; l = strchr(l, '\0') + 1) {
>+	for (l = lbuf; l != lbuf + names_length; l = strchr(l, '\0') + 1) {
> 		if (api_unconvert(name, l, flags))
> 			continue;
> 		if (flags & ATTR_DONTFOLLOW)
>@@ -314,7 +314,7 @@
> 	   attrlist_cursor_t *cursor)
> {
> 	const char *l;
>-	int c, count = 0;
>+	int names_length, c, count = 0;
> 	char lbuf[MAXLISTLEN];
> 	char name[MAXNAMELEN+16];
> 	unsigned int start_offset, end_offset;
>@@ -325,14 +325,14 @@
> 	}
> 	bzero(buffer, sizeof(attrlist_t));
> 
>-	c = flistxattr(fd, lbuf, sizeof(lbuf));
>-	if (c < 0)
>-		return c;
>+	names_length = flistxattr(fd, lbuf, sizeof(lbuf));
>+	if (names_length < 0)
>+		return names_length;
> 
> 	start_offset = sizeof(attrlist_t);
> 	end_offset = buffersize & ~(8-1);	/* 8 byte align */
> 
>-	for (l = lbuf; l != lbuf + c; l = strchr(l, '\0') + 1) {
>+	for (l = lbuf; l != lbuf + names_length; l = strchr(l, '\0') + 1) {
> 		if (api_unconvert(name, l, flags))
> 			continue;
> 		c = fgetxattr(fd, l, NULL, 0);

Actions: View | Diff

Attachments on bug 200623: 148328