yugui	2008-12-25 18:57:29 +0900 (Thu, 25 Dec 2008)

  New Revision: 21037

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21037

  Log:
    merges r20986 from trunk into ruby_1_9_1.
    * lib/rdoc/parser.rb (RDoc::Parser.binary?): should read in binary mode.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/rdoc/parser.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21036)
+++ ruby_1_9_1/ChangeLog	(revision 21037)
@@ -1,3 +1,7 @@
+Thu Dec 25 14:51:43 2008  NAKAMURA Usaku  <usa@r...>
+
+	* lib/rdoc/parser.rb (RDoc::Parser.binary?): should read in binary mode.
+
 Thu Dec 25 13:28:20 2008  NAKAMURA Usaku  <usa@r...>
 
 	* io.c (rb_io_flush): fsync() after buffer is flushed on win32.
Index: ruby_1_9_1/lib/rdoc/parser.rb
===================================================================
--- ruby_1_9_1/lib/rdoc/parser.rb	(revision 21036)
+++ ruby_1_9_1/lib/rdoc/parser.rb	(revision 21037)
@@ -67,7 +67,7 @@
   # the gem).
 
   def self.binary?(file)
-    s = (File.read(file, File.stat(file).blksize) || "").split(//)
+    s = (File.read(file, File.stat(file).blksize, 0, :mode => "rb") || "").split(//)
 
     if s.size > 0 then
       ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/