guix_mirror_bot pushed a commit to branch master
in repository guix.

commit 640ede2f1648fd838355112a067abdbb8c4ee433
Author: Yelninei <[email protected]>
AuthorDate: Mon Oct 26 08:42:23 2026 +0000

    syscalls: Support ports and file descriptors in getxattr/setxattr.
    
    * guix/build/syscalls.scm (getxattr, setxattr): Use 
fgetxattr(3)/fsetxattr(3)
    when the input is a port or file descriptor.
    * tests/syscalls.scm: Add test.
    
    Signed-off-by: Ludovic Courtès <[email protected]>
---
 guix/build/syscalls.scm | 87 ++++++++++++++++++++++++++++++-------------------
 tests/syscalls.scm      | 28 ++++++++++++++++
 2 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index bb5769d931e..eae8bb39543 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -1065,50 +1065,69 @@ backend device."
              (list (strerror err))
              (list err))))))
 
-(define getxattr
-  (let ((proc (syscall->procedure ssize_t "getxattr"
-                                  `(* * * ,size_t))))
-    (lambda (file key)
-      "Get the extended attribute value for KEY on FILE."
-      (let-values (((size err)
-                    ;; Get size of VALUE for buffer.
-                    (proc (string->pointer/utf-8 file)
-                          (string->pointer key)
-                          (string->pointer "")
-                          0)))
-        (cond ((< size 0)
-               (throw 'system-error "getxattr" "~S ~S: ~A"
-                      (list file key (strerror err))
-                      (list err)))
-              ((zero? size) "")
-              ;; Get VALUE in buffer of SIZE.  XXX actual size can race.
-              (else (let*-values (((buf) (make-bytevector size))
-                                  ((size err)
-                                   (proc (string->pointer/utf-8 file)
-                                         (string->pointer key)
-                                         (bytevector->pointer buf)
-                                         size)))
-                      (if (>= size 0)
-                          (utf8->string buf)
-                          (throw 'system-error "getxattr" "~S ~S: ~A"
-                                 (list file key (strerror err))
-                                 (list err))))))))))
+(define %libc-getxattr (syscall->procedure ssize_t "getxattr"
+                                           `(* * * ,size_t)))
+(define %libc-fgetxattr (syscall->procedure ssize_t "fgetxattr"
+                                            `(,int * * ,size_t)))
+
+(define (getxattr object key)
+  "Get the extended attribute value for KEY on OBJECT.
+OBJECT can be either a string, file-port or file descriptor."
+  (let* ((use-fdes? (or (integer? object)
+                        (file-port? object)))
+         (proc (if use-fdes? %libc-fgetxattr %libc-getxattr))
+         (arg  (if use-fdes?
+                   (if (file-port? object) (fileno object) object)
+                   (string->pointer/utf-8 object))))
+    (let-values (((size err)
+                  ;; Get size of VALUE for buffer.
+                  (proc arg
+                        (string->pointer key)
+                        (string->pointer "")
+                        0)))
+      (cond ((< size 0)
+             (throw 'system-error "getxattr" "~S ~S: ~A"
+                    (list object key (strerror err))
+                    (list err)))
+            ((zero? size) "")
+            ;; Get VALUE in buffer of SIZE.  XXX actual size can race.
+            (else (let*-values (((buf) (make-bytevector size))
+                                ((size err)
+                                 (proc arg
+                                       (string->pointer key)
+                                       (bytevector->pointer buf)
+                                       size)))
+                    (if (>= size 0)
+                        (utf8->string buf)
+                        (throw 'system-error "getxattr" "~S ~S: ~A"
+                               (list object key (strerror err))
+                               (list err)))))))))
+
+(define %libc-setxattr (syscall->procedure int "setxattr"
+                                           `(* * * ,size_t ,int)))
+(define %libc-fsetxattr (syscall->procedure int "fsetxattr"
+                                           `(,int * * ,size_t ,int)))
 
 (define setxattr
-  (let ((proc (syscall->procedure int "setxattr"
-                                  `(* * * ,size_t ,int))))
-    (lambda* (file key value #:optional (flags 0))
-      "Set extended attribute KEY to VALUE on FILE."
+  (lambda* (object key value #:optional (flags 0))
+    "Set extended attribute KEY to VALUE on OBJECT.
+OBJECT can be either a string, file-port or file descriptor."
+    (let* ((use-fdes? (or (integer? object)
+                          (file-port? object)))
+           (proc (if use-fdes? %libc-fsetxattr %libc-setxattr))
+           (arg  (if use-fdes?
+                     (if (file-port? object) (fileno object) object)
+                     (string->pointer/utf-8 object))))
       (let*-values (((bv) (string->utf8 value))
                     ((ret err)
-                     (proc (string->pointer/utf-8 file)
+                     (proc arg
                            (string->pointer key)
                            (bytevector->pointer bv)
                            (bytevector-length bv)
                            flags)))
         (unless (zero? ret)
           (throw 'system-error "setxattr" "~S ~S: ~A"
-                 (list file key value (strerror err))
+                 (list object key value (strerror err))
                  (list err)))))))
 
 
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index d7d154650ed..f4cd71817a6 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -348,6 +348,34 @@
         ;; attributes.
         (memv (system-error-errno args) (list ENOTSUP))))))
 
+(false-if-exception (delete-file temp-file))
+(test-assert "fgetxattr, fsetxattr: file descritor"
+  (let ((key "user.translator")
+        (value "/hurd/pfinet\0")
+        (fd (open-fdes temp-file (logior O_NOTRANS O_CREAT))))
+    (catch 'system-error
+      (lambda ()
+        (setxattr fd key value)
+        (string=? (getxattr fd key) value))
+      (lambda args
+        ;; Accept ENOTSUP, if the file-system does not support extended user
+        ;; attributes.
+        (memv (system-error-errno args) (list ENOTSUP))))))
+
+(false-if-exception (delete-file temp-file))
+(test-assert "fgetxattr, fsetxattr: file port"
+  (let ((key "user.translator")
+        (value "/hurd/pfinet\0")
+        (port (open temp-file (logior O_NOTRANS O_CREAT))))
+    (catch 'system-error
+      (lambda ()
+        (setxattr port key value)
+        (string=? (getxattr port key) value))
+      (lambda args
+        ;; Accept ENOTSUP, if the file-system does not support extended user
+        ;; attributes.
+        (memv (system-error-errno args) (list ENOTSUP))))))
+
 (false-if-exception (delete-file temp-file))
 (test-equal "fcntl-flock wait"
   42                                              ; the child's exit status

Reply via email to