* io.c (io_reopen): restore exact mode. fixed: [ruby-core:04003]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c5652e9f..696a3ab56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
-Thu Dec 23 09:18:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Dec 23 09:38:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (io_reopen): readable flag was left unset for read-only IO.
-	  fixed: [ruby-core:04003]
+	* io.c (io_reopen): restore exact mode.  fixed: [ruby-core:04003]
 
 Thu Dec 23 00:16:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/io.c b/io.c
index 370765a08..0604b6e0e 100644
--- a/io.c
+++ b/io.c
@@ -3185,10 +3185,11 @@ io_reopen(io, nfile)
 	}
 	else {
 	    FILE *f2 = fptr->f2;
+	    int m = fptr->mode;
 	    fclose(fptr->f);
 	    fptr->f = f2;
 	    fptr->f2 = NULL;
-	    fptr->mode &= ~FMODE_READABLE;
+	    fptr->mode &= (m & FMODE_READABLE) ? ~FMODE_READABLE : ~FMODE_WRITABLE;
 	    if (dup2(fd2, fd) < 0)
 		rb_sys_fail(orig->path);
 	    if (f2) {
@@ -3198,7 +3199,7 @@ io_reopen(io, nfile)
 	    else {
 		fptr->f = rb_fdopen(fd, mode);
 	    }
-	    fptr->mode |= FMODE_READABLE;
+	    fptr->mode = m;
 	}
 	rb_thread_fd_close(fd);
 	if ((orig->mode & FMODE_READABLE) && pos >= 0) {