Fixed an issue with writing multi-byte characters to the IO stdin str…

…eam. NoMethodError You have a nil object when you didn't expect it! albino (1.2.3) lib/albino/process.rb:167:in block in read_and_write
raid5 · Feb 2, 2011 · c115c80 · nono · Feb 2, 2011 · nono
1 parent 1219478
commit c115c80
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/lib/albino/process.rb b/lib/albino/process.rb
@@ -158,16 +158,11 @@ def read_and_write(input, stdin, stdout, stderr, timeout=nil, max=nil)
         # write to stdin stream
         ready[1].each do |fd|
           begin
-            boom = nil
-            size = fd.write_nonblock(input)
-            input = input[size, input.size]
-          rescue Errno::EPIPE => boom
-          rescue Errno::EAGAIN, Errno::EINTR
-          end
-          if boom || input.size == 0
-            stdin.close
-            writers.delete(stdin)
+            fd.write(input)
+          rescue Errno::EPIPE, Errno::EAGAIN, Errno::EINTR
           end
+          stdin.close
+          writers.delete(stdin)
         end
 
         # read from stdout and stderr streams

diff --git a/test/process_test.rb b/test/process_test.rb
@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'albino'
 require 'rubygems'
 require 'test/unit'
@@ -48,6 +49,12 @@ def test_input
     p = Albino::Process.new(['wc', '-l'], {}, :input => input)
     assert_equal 100_000, p.out.strip.to_i
   end
+
+  def test_utf8_input
+    input = "smörgåsbord\n" * 100_000
+    p = Albino::Process.new(['wc', '-l'], {}, :input => input)
+    assert_equal 100_000, p.out.strip.to_i
+  end
 
   def test_max
     assert_raise Albino::Process::MaximumOutputExceeded do