kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (ARGF_FORWARD): wrongly compares with current_file with

Browse source 
rb_stdout.  should be rb_stdin.  [ruby-cvs:20177]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-08-15 07:47:03 +00:00
parent ad1e42421c
commit 758c51cafe
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Aug 15 16:44:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (ARGF_FORWARD): wrongly compares with current_file with
rb_stdout. should be rb_stdin. [ruby-cvs:20177]
Wed Aug 15 14:59:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_initialize, argf_each_line, argf_each_byte): suppress

10
io.c
View file

@ -4308,7 +4308,7 @@ argf_forward(int argc, VALUE *argv)
}
#define ARGF_FORWARD(argc, argv) do {\
if (current_file == rb_stdout && TYPE(current_file) != T_FILE)\
if (current_file == rb_stdin && TYPE(current_file) != T_FILE)\
return argf_forward(argc, argv);\
} while (0)
#define NEXT_ARGF_FORWARD(argc, argv) do {\
@ -4447,7 +4447,7 @@ argf_getline(int argc, VALUE *argv)
retry:
if (!next_argv()) return Qnil;
if (current_file == rb_stdout && TYPE(current_file) != T_FILE) {
if (current_file == rb_stdin && TYPE(current_file) != T_FILE) {
line = rb_funcall3(current_file, rb_intern("gets"), argc, argv);
}
else {
@ -5359,7 +5359,7 @@ argf_read(int argc, VALUE *argv)
if (!next_argv()) {
return str;
}
if (current_file == rb_stdout && TYPE(current_file) != T_FILE) {
if (current_file == rb_stdin && TYPE(current_file) != T_FILE) {
tmp = argf_forward(argc, argv);
}
else {
@ -5405,7 +5405,7 @@ argf_readpartial(int argc, VALUE *argv)
rb_str_resize(str, 0);
rb_eof_error();
}
if (current_file == rb_stdout && TYPE(current_file) != T_FILE) {
if (current_file == rb_stdin && TYPE(current_file) != T_FILE) {
tmp = rb_rescue2(argf_forward, (VALUE)argv,
argf_readpartial_rescue, (VALUE)Qnil,
rb_eEOFError, (VALUE)0);
@ -5435,7 +5435,7 @@ argf_getc(void)
retry:
if (!next_argv()) return Qnil;
if (current_file == rb_stdout && TYPE(current_file) != T_FILE) {
if (current_file == rb_stdin && TYPE(current_file) != T_FILE) {
ch = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
}
else {