From 1b80c453fdb0acfc386b46c93ca572f0c99bc10b Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <ehrenbed@carleton.edu>
Date: Thu, 21 Feb 2008 19:09:53 -0600
Subject: [PATCH] Little changes for encodings

---
 core/io/encodings/encodings.factor   | 6 +++---
 extra/io/unix/sockets/sockets.factor | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor
index 28cf36060b..dfd9f9a36f 100755
--- a/core/io/encodings/encodings.factor
+++ b/core/io/encodings/encodings.factor
@@ -92,17 +92,17 @@ M: decoded stream-read
 
 M: decoded stream-read-partial stream-read ;
 
-: read-until-loop ( stream delim -- ch )
+: decoded-read-until ( stream delim -- ch )
     ! Copied from { c-reader stream-read-until }!!!
     over stream-read1 dup [
-        dup pick memq? [ 2nip ] [ , read-until-loop ] if
+        dup pick memq? [ 2nip ] [ , decoded-read-until ] if
     ] [
         2nip
     ] if ;
 
 M: decoded stream-read-until
     ! Copied from { c-reader stream-read-until }!!!
-    [ swap read-until-loop ] "" make
+    [ swap decoded-read-until ] "" make
     swap over empty? over not and [ 2drop f f ] when ;
 
 : fix-read1 ( stream char -- char )
diff --git a/extra/io/unix/sockets/sockets.factor b/extra/io/unix/sockets/sockets.factor
index 60a49aadd2..b78abbe11b 100755
--- a/extra/io/unix/sockets/sockets.factor
+++ b/extra/io/unix/sockets/sockets.factor
@@ -48,7 +48,7 @@ M: unix-io (client) ( addrspec -- stream )
     dup r> r> connect
     zero? err_no EINPROGRESS = or [
         dup init-client-socket
-        dup handle>duplex-stream
+        dup f handle>duplex-stream
         dup duplex-stream-out
         dup wait-to-connect
         pending-init-error