3519 - reading lots of data from a socket

In the process I've also altered the API of $read-from-socket to return
a boolean (eof?) rather than the number of bytes read (which is implicit
in the length of the returned array).

1 files changed, 6 insertions, 3 deletions

diff --git a/092socket.mu b/092socket.mu
index 43e98f22..fed6d927 100644
--- a/092socket.mu
+++ b/092socket.mu
@@ -120,17 +120,20 @@ def receive-from-socket session:num, sink:&:sink:char -> sink:&:sink:char [
   local-scope
   load-ingredients
   {
-    req:text, bytes-read:num <- $read-from-socket session, 4096/bytes
-    $print [read ], bytes-read, [ bytes from socket], 10/newline
+    req:text, eof?:bool <- $read-from-socket session, 4096/bytes
+    bytes-read:num <- length *req
+#?     $print [read ], bytes-read, [ bytes from socket], 10/newline
     i:num <- copy 0
     {
+#?       $print [  write ], i, 10/newline
       done?:bool <- greater-or-equal i, bytes-read
       break-if done?
-      c:char <- index *req, i
+      c:char <- index *req, i  # todo: unicode
       sink <- write sink, c
       i <- add i, 1
       loop
     }
+    loop-unless eof?
   }
   sink <- close sink
 ]