From e2632074f272b236a2b4a71b74f9be01a584245f Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 19 Feb 2002 04:19:06 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 ++++ io.c | 2 +- version.h | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59e7f11a4ed138..e87be861b0849b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 19 13:16:08 2002 Nobuyoshi Nakada + + * io.c (rb_io_ungetc): don't fail pushed EOF back. + Mon Feb 18 13:56:44 2002 Yukihiro Matsumoto * eval.c (block_pass): "&nil" should clear block given. diff --git a/io.c b/io.c index d2abd6544fdddf..8bd8603c66d736 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 3fe0bce08d8f2e..f58e7534f8ba99 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