From patchwork Sat Jun 25 17:18:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 40325 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 DD5BC27BBEA; Sat, 25 Jun 2022 18:19:18 +0100 (BST) 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, SPF_HELO_PASS 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 9789E27BBE9 for ; Sat, 25 Jun 2022 18:19:18 +0100 (BST) Received: from localhost ([::1]:60974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o59RF-00010f-PQ for patchwork@mira.cbaines.net; Sat, 25 Jun 2022 13:19:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o59R0-00010W-Pt for guix-patches@gnu.org; Sat, 25 Jun 2022 13:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o59R0-00040u-Hf for guix-patches@gnu.org; Sat, 25 Jun 2022 13:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o59R0-0006mN-BD for guix-patches@gnu.org; Sat, 25 Jun 2022 13:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56218] [PATCH] guix: inferior: Fix the behaviour of open-inferior #:error-port. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Jun 2022 17:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56218@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165617753426039 (code B ref -1); Sat, 25 Jun 2022 17:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jun 2022 17:18:54 +0000 Received: from localhost ([127.0.0.1]:46155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o59Qs-0006lv-By for submit@debbugs.gnu.org; Sat, 25 Jun 2022 13:18:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:40238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o59Qp-0006ll-Va for submit@debbugs.gnu.org; Sat, 25 Jun 2022 13:18:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o59Qp-00010N-Q8 for guix-patches@gnu.org; Sat, 25 Jun 2022 13:18:51 -0400 Received: from mira.cbaines.net ([212.71.252.8]:36428) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o59Qo-00040D-84 for guix-patches@gnu.org; Sat, 25 Jun 2022 13:18:51 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id ED17E27BBE9 for ; Sat, 25 Jun 2022 18:18:47 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 1fba1de2 for ; Sat, 25 Jun 2022 17:18:47 +0000 (UTC) From: Christopher Baines Date: Sat, 25 Jun 2022 18:18:47 +0100 Message-Id: <20220625171847.29104-1-mail@cbaines.net> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=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 This should be the error port used by the inferior process, but currently it's either stderr if #:error-port is a file port, or /dev/null otherwise. I'm looking at this as the Guix Data Service uses this behaviour to record and display logs from inferior processes. * guix/inferior.scm (open-bidirectional-pipe): Call dup2 for file descriptor 2, passing either the file number for the current error port, or a file descriptor for /dev/null. --- guix/inferior.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 54200b75e4..e36806ac84 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -156,12 +156,14 @@ (define (open-bidirectional-pipe command . args) (close-port parent) (close-fdes 0) (close-fdes 1) + (close-fdes 2) (dup2 (fileno child) 0) (dup2 (fileno child) 1) ;; Mimic 'open-pipe*'. - (unless (file-port? (current-error-port)) - (close-fdes 2) - (dup2 (open-fdes "/dev/null" O_WRONLY) 2)) + (dup2 (if (file-port? (current-error-port)) + (fileno (current-error-port)) + (open-fdes "/dev/null" O_WRONLY)) + 2) (apply execlp command command args)) (lambda () (primitive-_exit 127))))