From ffa31c264500817f1579be5c6b2d9b943b3b9cf4 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 16 Apr 2007 07:48:50 +0000 Subject: [PATCH] * ext/stringio/stringio.c (strio_seek): consistent behavior with IO#seek. patch by sheepman in [ruby-dev:30710]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/stringio/stringio.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 316280d46f..e1efea1afb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 16 16:49:32 2007 Nobuyoshi Nakada + + * ext/stringio/stringio.c (strio_seek): consistent behavior with + IO#seek. patch by sheepman in [ruby-dev:30710]. + Mon Apr 16 10:51:37 2007 Yukihiro Matsumoto * enum.c (enum_each_with_index): each_with_index to forward diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 969d007f8b..658d923dd6 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -597,6 +597,9 @@ strio_seek(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "11", NULL, &whence); offset = NUM2LONG(argv[0]); + if (CLOSED(ptr)) { + rb_raise(rb_eIOError, "closed stream"); + } switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) { case 0: break; @@ -607,7 +610,7 @@ strio_seek(int argc, VALUE *argv, VALUE self) offset += RSTRING_LEN(ptr->string); break; default: - rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence)); + error_inval("invalid whence"); } if (offset < 0) { error_inval(0);