From 97c6bc5ffd1deb626795057f01efda9ebdd9296f Mon Sep 17 00:00:00 2001 From: nahi Date: Sat, 2 Sep 2006 03:06:33 +0000 Subject: [PATCH] * lib/csv.rb (CSV::IOReader#initialize): use String#[](pos, len) instead of String#[](idx) to check utf BOM. follows String#[](idx) behavior change of 1.9. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/csv.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 71a9f993bd..9510468f10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Sep 2 12:00:32 2006 NAKAMURA, Hiroshi + + * lib/csv.rb (CSV::IOReader#initialize): use String#[](pos, len) + instead of String#[](idx) to check utf BOM. follows String#[](idx) + behavior change of 1.9. + Fri Sep 1 22:07:04 2006 Yukihiro Matsumoto * ruby.h (RSTRING_EMBED_LEN_MASK): uses 5 bits to support 64bit diff --git a/lib/csv.rb b/lib/csv.rb index 0f6907be57..536ed8af58 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -599,7 +599,7 @@ class CSV @rs = rs @dev = CSV::IOBuf.new(@io) @idx = 0 - if @dev[0] == 0xef and @dev[1] == 0xbb and @dev[2] == 0xbf + if @dev[0, 3] == "\xef\xbb\xbf" @idx += 3 end @close_on_terminate = false