From 9dbcde8882a8a917b6d0329e06ea2232e62b1c8c Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Mon, 19 Jun 2017 21:20:03 -0700
Subject: awk macro: bugfix: non-use of redirection mode strings.

The problem here is that ensure-stream ignores the mode
argument and decides between "r" and "w". That is incorrect;
the mode could be "a" for append.

The second problem is that the ignored mode strings are
also wrong. For an input pipe, "w" is specified rather than
"r".

* share/txr/stdlib/awk.tl (sys:awk-state ensure-stream): Use
the mode argument. The cases consolidate, because all that
need be distinguished here is file versus pipe.
(sys:awk-mac-let): for the <! redirection (input from pipe),
the mode must be "r", not "w".
---
 share/txr/stdlib/awk.tl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'share')

diff --git a/share/txr/stdlib/awk.tl b/share/txr/stdlib/awk.tl
index aab6a4eb..6b2f6ee2 100644
--- a/share/txr/stdlib/awk.tl
+++ b/share/txr/stdlib/awk.tl
@@ -191,10 +191,8 @@
   (hash-update-1 self.streams
                  ^(,kind ,path)
                  (do or @1 (caseq kind
-                             (:inf (open-file path "r"))
-                             (:outf (open-file path "w"))
-                             (:inp (open-command path "r"))
-                             (:outp (open-command path "w"))))
+                             ((:inf :outf) (open-file path mode))
+                             ((:inp :outp) (open-command path mode))))
                  nil))
 
 (defmeth sys:awk-state close-or-flush (self stream kind path val)
@@ -383,7 +381,7 @@
                 (!> (path . body)
                   ^(sys:awk-redir ,',aws-sym *stdout* :outp "w" ,path ,body))
                 (<! (path . body)
-                  ^(sys:awk-redir ,',aws-sym *stdin* :inp "w" ,path ,body)))
+                  ^(sys:awk-redir ,',aws-sym *stdin* :inp "r" ,path ,body)))
        ,*body)))
 
 (defmacro sys:awk-fun-let (aws-sym . body)
-- 
cgit v1.2.3