diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-02 03:53:01 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-02 03:53:01 +0000 |
commit | 10547e3c412be6f4f14f818294bf456dacad1ec4 (patch) | |
tree | b31d0d8d763d62854b4b46a436ae796f5f3f85ba | |
parent | c78dbcd13121cecaac64fec7956d0929867bff50 (diff) | |
download | ruby-10547e3c412be6f4f14f818294bf456dacad1ec4.tar.gz |
* lib/rdoc/parser.rb (binary?): regression.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/rdoc/parser.rb | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Apr 2 12:52:25 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/rdoc/parser.rb (binary?): regression. + Fri Apr 2 11:54:49 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (init_env): wrong calculation of the head of setenv diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb index d29599c879..9ad1fbdf66 100644 --- a/lib/rdoc/parser.rb +++ b/lib/rdoc/parser.rb @@ -67,7 +67,7 @@ class RDoc::Parser # content that an RDoc parser shouldn't try to consume. def self.binary?(file) - s = File.read(file, File.stat(file).blksize) || "" + s = File.read(file, File.stat(file).blksize || 1024) || "" if s[0, 2] == Marshal.dump('')[0, 2] then true |