From patchwork Tue Dec 21 19:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 35528 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4FC4327BBEA; Tue, 21 Dec 2021 19:42:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF5AE27BBE9 for ; Tue, 21 Dec 2021 19:42:51 +0000 (GMT) Received: from localhost ([::1]:41872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzl2A-0006I2-Rr for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 14:42:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkxX-0002fD-13 for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzkxW-0004Kn-ON for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzkxW-0007AB-Mz for guix-patches@gnu.org; Tue, 21 Dec 2021 14:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52715] [PATCH v2 1/4] syscalls: Add 'lchown'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 19:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52715 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52715@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164011544227472 (code B ref -1); Tue, 21 Dec 2021 19:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 19:37:22 +0000 Received: from localhost ([127.0.0.1]:55704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwd-00078d-Dd for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:37:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:37572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzkwT-000778-8A for submit@debbugs.gnu.org; Tue, 21 Dec 2021 14:36:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwT-0001y9-1V for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:57 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:57037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzkwP-0004Ej-8L for guix-patches@gnu.org; Tue, 21 Dec 2021 14:36:56 -0500 Received: (Authenticated sender: brice@waegenei.re) by relay12.mail.gandi.net (Postfix) with ESMTPSA id C7D1F200004 for ; Tue, 21 Dec 2021 19:36:49 +0000 (UTC) From: Brice Waegeneire Date: Tue, 21 Dec 2021 20:36:43 +0100 Message-Id: <20211221193646.16849-1-brice@waegenei.re> X-Mailer: git-send-email 2.34.0 In-Reply-To: <8735mleoxo.fsf_-_@waegenei.re> References: <8735mleoxo.fsf_-_@waegenei.re> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.178.232; envelope-from=brice@waegenei.re; helo=relay12.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build/syscalls.scm (lchown): New procedure. * gnu/packages/patches/guile-3.0-linux-syscalls.patch: Add lchown. * tests/syscalls.scm ("lchown, ENOENT", "lchown, no changes", "lchown, regular file", "lchown, symlink"): New tests. --- .../patches/guile-3.0-linux-syscalls.patch | 33 ++++++++++ guix/build/syscalls.scm | 16 +++++ tests/syscalls.scm | 62 +++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/gnu/packages/patches/guile-3.0-linux-syscalls.patch b/gnu/packages/patches/guile-3.0-linux-syscalls.patch index 0d27f77ee2..77edd9a993 100644 --- a/gnu/packages/patches/guile-3.0-linux-syscalls.patch +++ b/gnu/packages/patches/guile-3.0-linux-syscalls.patch @@ -3,7 +3,40 @@ This patch adds bindings to Linux syscalls for which glibc has symbols. Using the FFI would have been nice, but that's not an option when using a statically-linked Guile in an initrd that doesn't have libc.so around. +diff --git a/libguile/filesys.c b/libguile/filesys.c +index 4f7115397..2ade4cfca 100644 +--- a/libguile/filesys.c ++++ b/libguile/filesys.c +@@ -192,6 +192,27 @@ SCM_DEFINE (scm_chown, "chown", 3, 0, 0, + #undef FUNC_NAME + #endif /* HAVE_CHOWN */ + ++SCM_DEFINE (scm_lchown, "lchown", 3, 0, 0, ++ (SCM object, SCM owner, SCM group), ++ "As 'chown', change the ownership and group of the file referred to by\n" ++ "@var{file} to the integer values @var{owner} and @var{group} but\n" ++ "doesn't dereference symbolic links. Unlike 'chown' this doesn't support\n" ++ "port or integer file descriptor via 'fchown'.") ++#define FUNC_NAME s_scm_lchown ++{ ++ int rv; ++ ++ object = SCM_COERCE_OUTPORT (object); ++ ++ STRING_SYSCALL (object, c_object, ++ rv = lchown (c_object, ++ scm_to_int (owner), scm_to_int (group))); ++ if (rv == -1) ++ SCM_SYSERROR; ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ + + + SCM_DEFINE (scm_open_fdes, "open-fdes", 2, 1, 0, diff --git a/libguile/posix.c b/libguile/posix.c +index a1520abc4..61d57cdb9 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -2375,6 +2375,336 @@ scm_init_popen (void) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 45f95c509d..dbb96997d6 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,6 +119,7 @@ (define-module (guix build syscalls) scandir* getxattr setxattr + lchown fcntl-flock lock-file @@ -1277,6 +1279,20 @@ (define* (scandir* name #:optional (lambda () (closedir* directory))))) +(define-as-needed lchown + (let ((proc (syscall->procedure int "lchown" (list '* int int)))) + (lambda (file owner group) + "As 'chown', change the ownership and group of the file referred to by +FILE to the integer values OWNER and GROUP but doesn't dereference symbolic +links. Unlike 'chown' this doesn't support port or integer file descriptor +via 'fchown'." + (let-values (((ret err) + (proc (string->pointer file) owner group))) + (unless (zero? ret) + (throw 'system-error "lchown" "~S: ~A" + (list file (strerror err)) + (list err))))))) + ;;; ;;; Advisory file locking. diff --git a/tests/syscalls.scm b/tests/syscalls.scm index c9e011f453..24a8fd9726 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -287,6 +287,68 @@ (define perform-container-tests? (scandir* directory) (scandir directory (const #t) string