Fix my extended attribute fixes.

git-svn-id: svn+ssh://svn.n8gray.org/svnroot/n8gray/public/backup-bouncer@146 c73bc784-a200-0410-bfa9-bab0993648b8

VERSION

@@ -1 +1 @@
-0.1.1+
+0.1.2

tests.d/70-extended-attrs.test

@@ -30,6 +30,7 @@ compare () {
     for a in `xattr-util l $1`; do
         test "`xattr-util r $a $1`" = "`xattr-util r $a $2`" || return 1
     done
+    return 0
 }
 
 verify () {

util/xattr-util.c

@@ -4,10 +4,31 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+int show_xattr(char *file, char *name)
+{
+    int options = XATTR_NOFOLLOW;
+    int size = getxattr(file, name, NULL, 0, 0, options);
+    if (size < 0) {
+        return 0;
+    }
+    void *result = malloc(size);
+    if (NULL != result) {
+        size_t read_size = getxattr(file, name, result, size, 0, options);
+        if (read_size >= 0)  {
+            write(1, result, read_size);
+            free(result);
+            return 1;
+        }
+        free(result);
+    }
+    return 0;
+}
+
 int main(int argc, char *argv[]) {
 
     if (argc < 3) {
-        fprintf(stderr,"Usage: %s [l | r attr | w attr val] file\n", argv[0]);
+        fprintf(stderr,"Usage: %s [l | a | r attr | w attr val] file\n", 
+                argv[0]);
         return 1;
     }
 
@@ -18,19 +39,10 @@ int main(int argc, char *argv[]) {
             fprintf(stderr, "Wrong number of arguments\n");
             return 1;
         }
-        char *buf;
-        int size = getxattr(argv[3], argv[2], NULL, 0, 0, options);
-        if (size < 0) {
-            perror(argv[0]);
-            return 1;
-        }
-        if (NULL != (buf = malloc(size))) {
-            int read_size=getxattr(argv[3], argv[2], &buf[0], size, 0, options);
-            write(stdout, buf, (read_size < size ? read_size : size));
-        } else {
-            return 1;
-        }
-        return 0;
+        if (show_xattr(argv[3], argv[2]))
+            return 0;
+        perror(argv[0]);
+        return 1;
     } 
     else if (argv[1][0] == 'w') {
         /* Write mode */
@@ -72,6 +84,39 @@ int main(int argc, char *argv[]) {
         }
         return 0;
     }
+    else if (argv[1][0] == 'a') {
+        if (argc != 3) {
+            fprintf(stderr, "Wrong number of arguments\n");
+            return 1;
+        }
+        size_t size = listxattr(argv[2], NULL, 0, options);
+        if (size == 0) {
+            return 0;
+        }
+        if (size < 0) {
+            perror(argv[0]);
+            return 1;
+        }
+        char *buf = (char *)malloc(size);
+        size = listxattr(argv[2], buf, size, options);
+        if (size < 0) {
+            perror(argv[0]);
+            return 1;
+        }
+        char *end = buf + size;
+        void *value;
+        while(buf < end) {
+            printf("%s: \"", buf);
+            fflush(stdout);
+            if (!show_xattr(argv[2], buf)) {
+                perror(argv[0]);
+                return 1;
+            }
+            printf("\"\n");
+            buf += strlen(buf) + 1;
+        }
+        return 0;
+    }
     else {
         fprintf(stderr, "Bad arguments\n");
         return 1;