summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-19 04:19:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-02-19 04:19:06 +0000
commite2632074f272b236a2b4a71b74f9be01a584245f (patch)
tree6cf3cdaaef0fab0e05141652cddf2fd637f6b694
parentc444d6012fea7a7a81235735bc60f88c508a4238 (diff)
* io.c (rb_io_ungetc): don't fail pushed EOF back.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c2
-rw-r--r--version.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 59e7f11a4e..e87be861b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 19 13:16:08 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+ * io.c (rb_io_ungetc): don't fail pushed EOF back.
+
Mon Feb 18 13:56:44 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (block_pass): "&nil" should clear block given.
diff --git a/io.c b/io.c
index d2abd6544f..8bd8603c66 100644
--- a/io.c
+++ b/io.c
@@ -989,7 +989,7 @@ rb_io_ungetc(io, c)
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
- if (ungetc(cc, fptr->f) == EOF)
+ if (ungetc(cc, fptr->f) == EOF && cc != EOF)
rb_sys_fail(fptr->path);
return Qnil;
}
diff --git a/version.h b/version.h
index 3fe0bce08d..f58e7534f8 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.6.6"
-#define RUBY_RELEASE_DATE "2002-02-18"
+#define RUBY_RELEASE_DATE "2002-02-19"
#define RUBY_VERSION_CODE 166
-#define RUBY_RELEASE_CODE 20020218
+#define RUBY_RELEASE_CODE 20020219