diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-01-08 05:00:25 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-01-08 05:00:25 +0000 |
| commit | ee08592d029fdb8fcaab6eafded3d5bc22804d41 (patch) | |
| tree | f12f100a2b4900f3533586fa342cad65713f7855 /io.c | |
| parent | 0f1af179529faf45c3e11a80f26877b9ea1bf910 (diff) | |
| download | ruby-ee08592d029fdb8fcaab6eafded3d5bc22804d41.tar.gz ruby-ee08592d029fdb8fcaab6eafded3d5bc22804d41.tar.xz ruby-ee08592d029fdb8fcaab6eafded3d5bc22804d41.zip | |
2000-01-08
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -454,7 +454,9 @@ io_fread(ptr, len, f) if (!READ_DATA_PENDING(f)) { rb_thread_wait_fd(fileno(f)); } + TRAP_BEG; c = getc(f); + TRAP_END; if (c == EOF) { *ptr = '\0'; break; @@ -1456,7 +1458,8 @@ pipe_open(pname, mode) pipe_add_fptr(fptr); if (modef & FMODE_READABLE) fptr->f = f; if (modef & FMODE_WRITABLE) { - fptr->f2 = f; + if (fptr->f) fptr->f2 = f; + else fptr->f = f; rb_io_synchronized(fptr); } return (VALUE)port; |