From 3eb48e993ad1f50376660dadcfeeb697e4029940 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 16 Apr 2007 07:48:50 +0000 Subject: * 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/branches/ruby_1_8@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 48b17c9644..0a3b031c48 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 16:34:08 2007 Yukihiro Matsumoto * parse.y (parser_yylex): should set command_start after block diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index a64aaf837c..1ae1172be2 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -645,6 +645,9 @@ strio_seek(argc, argv, 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; @@ -655,7 +658,7 @@ strio_seek(argc, argv, self) offset += RSTRING(ptr->string)->len; break; default: - rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence)); + error_inval("invalid whence"); } if (offset < 0) { error_inval(0); -- cgit v1.2.3