summaryrefslogtreecommitdiff
path: root/ext/stringio
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 01:08:24 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 01:08:24 +0000
commitb07650769e112ecb33d1738eef4d61727183d9c7 (patch)
tree38998aa03ebd66fb1c972b342ce9af27fd540cc2 /ext/stringio
parentea229a855f3d12271aea16913ba3c2d78f0cc3ea (diff)
* stringio/stringio.c (strio_read): set ASCII-8BIT encoding
when length argument is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/stringio')
-rw-r--r--ext/stringio/stringio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 7514264..a525dff 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -1168,7 +1168,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
{
struct StringIO *ptr = readable(StringIO(self));
VALUE str = Qnil;
- long len, olen;
+ long len;
switch (argc) {
case 2:
@@ -1177,7 +1177,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
rb_str_modify(str);
case 1:
if (!NIL_P(argv[0])) {
- len = olen = NUM2LONG(argv[0]);
+ len = NUM2LONG(argv[0]);
if (len < 0) {
rb_raise(rb_eArgError, "negative length %ld given", len);
}
@@ -1189,7 +1189,6 @@ strio_read(int argc, VALUE *argv, VALUE self)
}
/* fall through */
case 0:
- olen = -1;
len = RSTRING_LEN(ptr->string);
if (len <= ptr->pos) {
if (NIL_P(str)) {
@@ -1209,6 +1208,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
}
if (NIL_P(str)) {
str = strio_substr(ptr, ptr->pos, len);
+ if (argc > 0) rb_enc_associate(str, rb_ascii8bit_encoding());
}
else {
long rest = RSTRING_LEN(ptr->string) - ptr->pos;