From ce60bbc8519465a125f975f4169f0bb644fcadf3 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 25 Aug 2008 08:36:46 +0000 Subject: * include/ruby/intern.h (rb_io_ungetbyte): added prototype. * io.c (rb_io_gets): use rb_io_getline_1 for unget buffer. * ruby.c (load_file): use rb_io_ungetbyte. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 +++++++- include/ruby/intern.h | 1 + io.c | 6 +----- ruby.c | 8 ++++---- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56d2bbc782..e28e82236e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -Mon Aug 25 17:35:23 2008 Nobuyoshi Nakada +Mon Aug 25 17:36:26 2008 Nobuyoshi Nakada + + * include/ruby/intern.h (rb_io_ungetbyte): added prototype. + + * io.c (rb_io_gets): use rb_io_getline_1 for unget buffer. + + * ruby.c (load_file): use rb_io_ungetbyte. * transcode.c (rb_econv_substr_append): fix for buffer overrun. diff --git a/include/ruby/intern.h b/include/ruby/intern.h index a75f813d12..70fbb00ca0 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -374,6 +374,7 @@ VALUE rb_io_write(VALUE, VALUE); VALUE rb_io_gets(VALUE); VALUE rb_io_getbyte(VALUE); VALUE rb_io_ungetc(VALUE, VALUE); +VALUE rb_io_ungetbyte(VALUE, VALUE); VALUE rb_io_close(VALUE); VALUE rb_io_flush(VALUE); VALUE rb_io_eof(VALUE); diff --git a/io.c b/io.c index 9e919c0759..6ca2f71f59 100644 --- a/io.c +++ b/io.c @@ -2213,11 +2213,7 @@ rb_io_getline(int argc, VALUE *argv, VALUE io) VALUE rb_io_gets(VALUE io) { - rb_io_t *fptr; - - GetOpenFile(io, fptr); - rb_io_check_readable(fptr); - return rb_io_getline_fast(fptr, io_read_encoding(fptr)); + return rb_io_getline_1(rb_default_rs, -1, io); } /* diff --git a/ruby.c b/ruby.c index 25d95901e7..5a51bbb52a 100644 --- a/ruby.c +++ b/ruby.c @@ -1260,12 +1260,12 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o } /* push back shebang for pragma may exist in next line */ - rb_io_ungetc(f, rb_str_new2("!\n")); + rb_io_ungetbyte(f, rb_str_new2("!\n")); } else if (!NIL_P(c)) { - rb_io_ungetc(f, c); + rb_io_ungetbyte(f, c); } - rb_io_ungetc(f, INT2FIX('#')); + rb_io_ungetbyte(f, INT2FIX('#')); if (no_src_enc && opt->src.enc.name) { opt->src.enc.index = opt_enc_index(opt->src.enc.name); src_encoding_index = opt->src.enc.index; @@ -1275,7 +1275,7 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o } } else if (!NIL_P(c)) { - rb_io_ungetc(f, c); + rb_io_ungetbyte(f, c); } require_libraries(opt); /* Why here? unnatural */ } -- cgit v1.2.3