From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Rob Browning Newsgroups: gmane.lisp.guile.devel Subject: [PATCH 1/1] scm_i_make_transcoded_port: fix mode for input/output ports Date: Sun, 4 Oct 2020 14:37:48 -0500 Message-ID: <20201004193748.277642-1-rlb@defaultvalue.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7764"; mail-complaints-to="usenet@ciao.gmane.io" To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Sun Oct 04 21:38:08 2020 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kP9pf-0001w2-Sh for guile-devel@m.gmane-mx.org; Sun, 04 Oct 2020 21:38:07 +0200 Original-Received: from localhost ([::1]:54242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kP9pe-0003YN-W6 for guile-devel@m.gmane-mx.org; Sun, 04 Oct 2020 15:38:07 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kP9pP-0003Qd-72 for guile-devel@gnu.org; Sun, 04 Oct 2020 15:37:51 -0400 Original-Received: from defaultvalue.org ([45.33.119.55]:38464) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kP9pN-0001p8-I7 for guile-devel@gnu.org; Sun, 04 Oct 2020 15:37:50 -0400 Original-Received: from trouble.defaultvalue.org (localhost [127.0.0.1]) (Authenticated sender: rlb@defaultvalue.org) by defaultvalue.org (Postfix) with ESMTPSA id A4AA320237 for ; Sun, 4 Oct 2020 14:37:48 -0500 (CDT) Original-Received: by trouble.defaultvalue.org (Postfix, from userid 1000) id 5840F14E072; Sun, 4 Oct 2020 14:37:48 -0500 (CDT) X-Mailer: git-send-email 2.26.1 Received-SPF: pass client-ip=45.33.119.55; envelope-from=rlb@defaultvalue.org; helo=defaultvalue.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/04 15:00:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.io gmane.lisp.guile.devel:20591 Archived-At: * libguile/r6rs-ports.c (scm_i_make_transcoded_ports): make sure to include SCM_RDNG for input/output ports. Thanks to Göran Weinholt for reporting the problem. Closes: 41045 --- Proposed for 3.0. libguile/r6rs-ports.c | 4 ++-- test-suite/tests/r6rs-ports.test | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c index 445ae5464..49ca05325 100644 --- a/libguile/r6rs-ports.c +++ b/libguile/r6rs-ports.c @@ -1168,8 +1168,8 @@ SCM_DEFINE (scm_i_make_transcoded_port, if (scm_is_true (scm_output_port_p (port))) mode |= SCM_WRTNG; - else if (scm_is_true (scm_input_port_p (port))) - mode |= SCM_RDNG; + if (scm_is_true (scm_input_port_p (port))) + mode |= SCM_RDNG; result = make_transcoded_port (port, mode); diff --git a/test-suite/tests/r6rs-ports.test b/test-suite/tests/r6rs-ports.test index 5b46cccd2..4d1981df2 100644 --- a/test-suite/tests/r6rs-ports.test +++ b/test-suite/tests/r6rs-ports.test @@ -919,6 +919,32 @@ not `set-port-position!'" (with-test-prefix "8.2.6 Input and output ports" + (define (check-transcoded-port-mode make-port pred) + (let ((p (make-port "/dev/null" (file-options no-fail)))) + (dynamic-wind + (lambda () #t) + (lambda () + (set! p (transcoded-port p (native-transcoder))) + (pred p)) + (lambda () (close-port p))))) + + (pass-if "transcoded-port preserves input mode" + (check-transcoded-port-mode open-file-input-port + (lambda (p) + (and (input-port? p) + (not (output-port? p)))))) + + (pass-if "transcoded-port preserves output mode" + (check-transcoded-port-mode open-file-output-port + (lambda (p) + (and (not (input-port? p)) + (output-port? p))))) + + (pass-if "transcoded-port preserves input/output mode" + (check-transcoded-port-mode open-file-input/output-port + (lambda (p) + (and (input-port? p) (output-port? p))))) + (pass-if "transcoded-port [output]" (let ((s "Hello\nÄÖÜ")) (bytevector=? -- 2.26.1