1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (fptr_finalize): should save errno just after failure.

Browse Source 
[ruby-dev:22492]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-01-06 12:55:05 +00:00
parent 77cb3aeba1
commit d231dc04d0
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jan 6 21:51:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (fptr_finalize): should save errno just after failure.
[ruby-dev:22492]
Tue Jan 6 20:51:10 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> Tue Jan 6 20:51:10 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
* lib/logger.rb(Logger#msg2str): no special treatment for the object * lib/logger.rb(Logger#msg2str): no special treatment for the object

15
io.c
View File

@ -1727,12 +1727,12 @@ fptr_finalize(fptr, noraise)
OpenFile *fptr; OpenFile *fptr;
int noraise; int noraise;
{ {
int n1 = 0, n2 = 0, e = 0, f1, f2 = -1; int n1 = 0, n2 = 0, f1, f2 = -1;
if (fptr->f2) { if (fptr->f2) {
f2 = fileno(fptr->f2); f2 = fileno(fptr->f2);
while ((n2 = fclose(fptr->f2)) < 0) { while (n2 = 0, fclose(fptr->f2) < 0) {
e = errno; n2 = errno;
if (!rb_io_wait_writable(f2)) { if (!rb_io_wait_writable(f2)) {
break; break;
} }
@ -1742,18 +1742,19 @@ fptr_finalize(fptr, noraise)
} }
if (fptr->f) { if (fptr->f) {
f1 = fileno(fptr->f); f1 = fileno(fptr->f);
while ((n1 = fclose(fptr->f)) < 0) { while (n1 = 0, fclose(fptr->f) < 0) {
n1 = errno;
if (f2 != -1 || !(fptr->mode & FMODE_WBUF)) break; if (f2 != -1 || !(fptr->mode & FMODE_WBUF)) break;
if (!rb_io_wait_writable(f1)) break; if (!rb_io_wait_writable(f1)) break;
if (!fptr->f) break; if (!fptr->f) break;
} }
fptr->f = 0; fptr->f = 0;
if (n1 < 0 && errno == EBADF && f1 == f2) { if (n1 == EBADF && f1 == f2) {
n1 = 0; n1 = 0;
} }
} }
if (!noraise && (n1 < 0 || n2 < 0)) { if (!noraise && (n1 || n2)) {
if (n1 == 0) errno = e; errno = (n1 ? n1 : n2);
rb_sys_fail(fptr->path); rb_sys_fail(fptr->path);
} }
} }