Changeset 69 in code for trunk/vendor/golang.org/x/sys/unix/xattr_bsd.go

Timestamp:

Sep 13, 2023, 10:49:50 AM (21 months ago)

Author:

Izuru Yakumo

Message:

Ready to release 0.6.0

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

File:

• trunk/vendor/golang.org/x/sys/unix/xattr_bsd.go (modified) (4 diffs)

trunk/vendor/golang.org/x/sys/unix/xattr_bsd.go

@@ -161 +161 @@
 
 func Listxattr(file string, dest []byte) (sz int, err error) {
-        d := initxattrdest(dest, 0)
         destsiz := len(dest)
 
         // FreeBSD won't allow you to list xattrs from multiple namespaces
-        s := 0
+        s, pos := 0, 0
         for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-                stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
+                stmp, e := ListxattrNS(file, nsid, dest[pos:])
 
                 /* Errors accessing system attrs are ignored so that
@@ -176 +175 @@
                  * we don't have read permissions on, so don't ignore those errors
                  */
-                if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-                        continue
-                } else if e != nil {
+                if e != nil {
+                        if e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+                                continue
+                        }
                         return s, e
                 }
 
                 s += stmp
-                destsiz -= s
-                if destsiz < 0 {
-                        destsiz = 0
-                }
-                d = initxattrdest(dest, s)
+                pos = s
+                if pos > destsiz {
+                        pos = destsiz
+                }
+        }
+
+        return s, nil
+}
+
+func ListxattrNS(file string, nsid int, dest []byte) (sz int, err error) {
+        d := initxattrdest(dest, 0)
+        destsiz := len(dest)
+
+        s, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
+        if e != nil {
+                return 0, err
         }
 
@@ -194 +205 @@
 
 func Flistxattr(fd int, dest []byte) (sz int, err error) {
-        d := initxattrdest(dest, 0)
-        destsiz := len(dest)
-
-        s := 0
+        destsiz := len(dest)
+
+        s, pos := 0, 0
         for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-                stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
-                if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-                        continue
-                } else if e != nil {
+                stmp, e := FlistxattrNS(fd, nsid, dest[pos:])
+
+                if e != nil {
+                        if e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+                                continue
+                        }
                         return s, e
                 }
 
                 s += stmp
-                destsiz -= s
-                if destsiz < 0 {
-                        destsiz = 0
-                }
-                d = initxattrdest(dest, s)
+                pos = s
+                if pos > destsiz {
+                        pos = destsiz
+                }
+        }
+
+        return s, nil
+}
+
+func FlistxattrNS(fd int, nsid int, dest []byte) (sz int, err error) {
+        d := initxattrdest(dest, 0)
+        destsiz := len(dest)
+
+        s, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
+        if e != nil {
+                return 0, err
         }
 
@@ -218 +241 @@
 
 func Llistxattr(link string, dest []byte) (sz int, err error) {
-        d := initxattrdest(dest, 0)
-        destsiz := len(dest)
-
-        s := 0
+        destsiz := len(dest)
+
+        s, pos := 0, 0
         for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
-                stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
-                if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-                        continue
-                } else if e != nil {
+                stmp, e := LlistxattrNS(link, nsid, dest[pos:])
+
+                if e != nil {
+                        if e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
+                                continue
+                        }
                         return s, e
                 }
 
                 s += stmp
-                destsiz -= s
-                if destsiz < 0 {
-                        destsiz = 0
-                }
-                d = initxattrdest(dest, s)
-        }
-
-        return s, nil
-}
+                pos = s
+                if pos > destsiz {
+                        pos = destsiz
+                }
+        }
+
+        return s, nil
+}
+
+func LlistxattrNS(link string, nsid int, dest []byte) (sz int, err error) {
+        d := initxattrdest(dest, 0)
+        destsiz := len(dest)
+
+        s, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
+        if e != nil {
+                return 0, err
+        }
+
+        return s, nil
+}