diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 17:55:45 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 17:55:45 +0000 |
commit | 77217e2c9c332571dea14470bc633fa61646952a (patch) | |
tree | 9318c9a5c20e31a8b99504508332081a20e020de | |
parent | 2abbf65dbec720f3b051f2cb01fd1c629885307d (diff) | |
download | ruby-77217e2c9c332571dea14470bc633fa61646952a.tar.gz ruby-77217e2c9c332571dea14470bc633fa61646952a.tar.xz ruby-77217e2c9c332571dea14470bc633fa61646952a.zip |
merge revision(s) 13774:
* io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@16911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | io.c | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Sun Jun 8 02:55:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093] + Sun Jun 8 01:53:50 2008 James Edward Gray II <jeg2@ruby-lang.org> Merged 13767, 13768, 13769, and 13770 from trunk. @@ -245,6 +245,7 @@ flush_before_seek(fptr) if (fptr->mode & FMODE_WBUF) { io_fflush(GetWriteFile(fptr), fptr); } + errno = 0; return fptr; } @@ -668,7 +669,7 @@ rb_io_tell(io) GetOpenFile(io, fptr); pos = io_tell(fptr); - if (pos < 0) rb_sys_fail(fptr->path); + if (pos < 0 && errno) rb_sys_fail(fptr->path); return OFFT2NUM(pos); } @@ -683,7 +684,7 @@ rb_io_seek(io, offset, whence) pos = NUM2OFFT(offset); GetOpenFile(io, fptr); pos = io_seek(fptr, pos, whence); - if (pos < 0) rb_sys_fail(fptr->path); + if (pos < 0 && errno) rb_sys_fail(fptr->path); clearerr(fptr->f); return INT2FIX(0); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 136 +#define RUBY_PATCHLEVEL 137 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |