summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-20 16:57:46 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-20 16:57:46 +0000
commit4a2cd03fbd73cefdc87e9602dc3dd1cf86a5a63d (patch)
tree61f7a6904baf2cea189c8dd78d5ba9ba36fe427d /io.c
parent1bfaed8f8d4de9eba8f5b282a18e886aed278a2a (diff)
* io.c (open_key_args): IO.foreach(path, rs, limit) didn't work.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/io.c b/io.c
index 880b3dc8a2..931692025d 100644
--- a/io.c
+++ b/io.c
@@ -6666,7 +6666,7 @@ open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
FilePathValue(argv[0]);
arg->io = 0;
- arg->argc = argc > 1 ? 1 : 0;
+ arg->argc = argc - 1;
arg->argv = argv + 1;
if (argc == 1) {
no_key:
@@ -6675,8 +6675,7 @@ open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
}
opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
if (NIL_P(opt)) goto no_key;
- if (argc > 2) arg->argc = 1;
- else arg->argc = 0;
+ arg->argc--;
v = rb_hash_aref(opt, sym_open_args);
if (!NIL_P(v)) {