X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fxattr.c;h=e58dc7ea6587264ab91d133d6d7339002c3f3b96;hp=d16939fc4cf37631344ce021f13f21fb30b3bc18;hb=088d0c53cfe0dcb20b87707a9055175b2fd6b72f;hpb=55a7427b7679e25134cd43488a9f74cb542416ea

diff --git a/daemon/xattr.c b/daemon/xattr.c
index d16939f..e58dc7e 100644
--- a/daemon/xattr.c
+++ b/daemon/xattr.c
@@ -24,16 +24,23 @@
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
 
 #if defined(HAVE_ATTR_XATTR_H) || defined(HAVE_SYS_XATTR_H)
 
-#ifdef HAVE_ATTR_XATTR_H
-#include <attr/xattr.h>
-#else
-#ifdef HAVE_SYS_XATTR_H
-#include <sys/xattr.h>
-#endif
-#endif
+# ifdef HAVE_ATTR_XATTR_H
+#  include <attr/xattr.h>
+# else
+#  ifdef HAVE_SYS_XATTR_H
+#   include <sys/xattr.h>
+#  endif
+# endif
+
+int
+optgroup_linuxxattrs_available (void)
+{
+  return 1;
+}
 
 static guestfs_int_xattr_list *getxattrs (const char *path, ssize_t (*listxattr) (const char *path, char *list, size_t size), ssize_t (*getxattr) (const char *path, const char *name, void *value, size_t size));
 static int _setxattr (const char *xattr, const char *val, int vallen, const char *path, int (*setxattr) (const char *path, const char *name, const void *value, size_t size, int flags));
@@ -403,14 +410,14 @@ do_lxattrlist (const char *path, char *const *names)
     fprintf (stderr, "lxattrlist: returning: [\n");
     for (k = 0; k < ret->guestfs_int_xattr_list_len; ++k) {
       const guestfs_int_xattr *entry = &ret->guestfs_int_xattr_list_val[k];
-      if (strcmp (entry[0].attrname, "") != 0) {
+      if (STRNEQ (entry[0].attrname, "")) {
         fprintf (stderr, "ERROR: expecting empty attrname at k = %zu\n", k);
         break;
       }
       fprintf (stderr, "  %zu: special attrval = %s\n",
                k, entry[0].attrval.attrval_val);
       for (i = 1; k+i < ret->guestfs_int_xattr_list_len; ++i) {
-        if (strcmp (entry[i].attrname, "") == 0)
+        if (STREQ (entry[i].attrname, ""))
           break;
         fprintf (stderr, "    name %s, value length %d\n",
                  entry[i].attrname, entry[i].attrval.attrval_len);
@@ -442,54 +449,52 @@ do_lxattrlist (const char *path, char *const *names)
 }
 
 #else /* no xattr.h */
+int
+optgroup_linuxxattrs_available (void)
+{
+  return 0;
+}
 
 guestfs_int_xattr_list *
 do_getxattrs (const char *path)
 {
-  reply_with_error ("getxattrs: no support for xattrs");
-  return NULL;
+  NOT_AVAILABLE (NULL);
 }
 
 guestfs_int_xattr_list *
 do_lgetxattrs (const char *path)
 {
-  reply_with_error ("lgetxattrs: no support for xattrs");
-  return NULL;
+  NOT_AVAILABLE (NULL);
 }
 
 int
 do_setxattr (const char *xattr, const char *val, int vallen, const char *path)
 {
-  reply_with_error ("setxattr: no support for xattrs");
-  return -1;
+  NOT_AVAILABLE (-1);
 }
 
 int
 do_lsetxattr (const char *xattr, const char *val, int vallen, const char *path)
 {
-  reply_with_error ("lsetxattr: no support for xattrs");
-  return -1;
+  NOT_AVAILABLE (-1);
 }
 
 int
 do_removexattr (const char *xattr, const char *path)
 {
-  reply_with_error ("removexattr: no support for xattrs");
-  return -1;
+  NOT_AVAILABLE (-1);
 }
 
 int
 do_lremovexattr (const char *xattr, const char *path)
 {
-  reply_with_error ("lremovexattr: no support for xattrs");
-  return -1;
+  NOT_AVAILABLE (-1);
 }
 
 guestfs_int_xattr_list *
 do_lxattrlist (const char *path, char *const *names)
 {
-  reply_with_error ("lxattrlist: no support for xattrs");
-  return NULL;
+  NOT_AVAILABLE (NULL);
 }
 
 #endif /* no xattr.h */