fix #getc to handle encodings properly; passes chars_spec

rubinius · Jan 20, 2015 · 4fb420e · 4fb420e
1 parent 94704d8
commit 4fb420e
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/kernel/common/io.rb b/kernel/common/io.rb
@@ -1499,9 +1499,20 @@ def getbyte
   #  f.getc   #=> 104
   def getc
     ensure_open
+    return if eof?
 
-    str = read(1)
-    return str
+    char = ""
+    until eof?
+      char.force_encoding Encoding::ASCII_8BIT
+      char << read(1)
+
+      char.force_encoding(self.external_encoding || Encoding.default_external)
+      if char.chr_at(0)
+        return IO.read_encode self, char
+      end
+    end
+
+    return nil
   end
 
   def gets(sep_or_limit=$/, limit=nil)