hurd: Fix getxattr/listxattr returning ERANGE

The manpage says that when the passed size is zero, they should set the
expected size and return 0. ERANGE shall be returned only when the non-zero
passed size is not large enough.

diff --git a/hurd/xattr.c b/hurd/xattr.c
index 1a84c90db878e974917989af336413f01fae49de..2d83edf2fe55f2f9db07ebee4f61dbb9ea55a9a0 100644 (file)
--- a/hurd/xattr.c
+++ b/hurd/xattr.c
@@ -50,7 +50,15 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size)
       else if (value)
        {
          if (*size < sizeof st.st_author)
-           return ERANGE;
+           {
+             if (*size > 0)
+               return ERANGE;
+             else
+               {
+                 *size = sizeof st.st_author;
+                 return 0;
+               }
+           }
          memcpy (value, &st.st_author, sizeof st.st_author);
        }
       *size = sizeof st.st_author;
@@ -73,12 +81,21 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size)
       err = __file_get_translator (port, &buf, &bufsz);
       if (err)
        return err;
-      if (value != NULL && *size < bufsz)
+
+      if (*size < bufsz)
        {
          if (buf != value)
            __munmap (buf, bufsz);
-         return ERANGE;
+
+         if (*size > 0)
+           return ERANGE;
+         else
+           {
+             *size = bufsz;
+             return 0;
+           }
        }
+
       if (buf != value && bufsz > 0)
        {
          if (value != NULL)
@@ -201,7 +218,7 @@ _hurd_xattr_list (io_t port, void *buffer, size_t *size)
   if (st.st_mode & S_IPTRANS)
     add ("gnu.translator");
 
-  if (buffer != NULL && total > *size)
+  if (*size > 0 && total > *size)
     return ERANGE;
   *size = total;
   return 0;