Merge of xfs-cmds-2.4.18:slinx:112563a by nathans.

  workaround for Andreas' list kernel bug.

1 files changed, 7 insertions, 6 deletions

diff --git a/getfattr/getfattr.c b/getfattr/getfattr.c
index e84c7c4..bc098b0 100644
--- a/getfattr/getfattr.c
+++ b/getfattr/getfattr.c
@@ -305,12 +305,10 @@ int list_attributes(const char *path, int *header_printed)
 
 	length = do_listxattr(path, NULL, 0);
 	if (length < 0) {
-		if (errno != ENOTSUP || errno != ENOSYS) {
-			fprintf(stderr, "%s: %s: %s\n",
-				progname, path, strerror_ea(errno));
-			had_errors++;
-			return 1;
-		}
+		fprintf(stderr, "%s: %s: %s\n",
+			progname, path, strerror_ea(errno));
+		had_errors++;
+		return 1;
 	} else if (length == 0)
 		return 0;
 		
@@ -325,6 +323,9 @@ int list_attributes(const char *path, int *header_printed)
 	}
 
 	for (l = list; l != list + length; l = strchr(l, '\0')+1) {
+		if (*l == '\0')	/* not a name, kernel bug */
+			continue;
+
 		if (regexec(&name_regex, l, 0, NULL, 0) != 0)
 			continue;