* lib.c (simple_lazy_stream_func): Bugfix: close the stream

if get_line returns nil.

* stream.c (cat_get_line, cat_get_char, cat_get_byte): The catenated
stream read operations close an exhausted stream before popping
to the next one.

* txr.1: Document closing behavior of catenated streams.

1 files changed, 9 insertions, 3 deletions

diff --git a/stream.c b/stream.c
index c4632344..7945e43c 100644
--- a/stream.c
+++ b/stream.c
@@ -2386,9 +2386,11 @@ static val cat_get_line(val stream)
   val streams = coerce(val, stream->co.handle);
 
   while (streams) {
-    val line = get_line(first(streams));
+    val fs = first(streams);
+    val line = get_line(fs);
     if (line)
       return line;
+    close_stream(fs, t);
     if ((streams = rest(streams)) != nil)
       stream->co.handle = coerce(mem_t *, streams);
   }
@@ -2401,9 +2403,11 @@ static val cat_get_char(val stream)
   val streams = coerce(val, stream->co.handle);
 
   while (streams) {
-    val ch = get_char(first(streams));
+    val fs = first(streams);
+    val ch = get_char(fs);
     if (ch)
       return ch;
+    close_stream(fs, t);
     if ((streams = rest(streams)) != nil)
       stream->co.handle = coerce(mem_t *, streams);
   }
@@ -2416,9 +2420,11 @@ static val cat_get_byte(val stream)
   val streams = coerce(val, stream->co.handle);
 
   while (streams) {
-    val byte = get_byte(first(streams));
+    val fs = first(streams);
+    val byte = get_byte(fs);
     if (byte)
       return byte;
+    close_stream(fs, t);
     if ((streams = rest(streams)) != nil)
       stream->co.handle = coerce(mem_t *, streams);
   }