[PATCH 2/2] wip

[Eric Wong <e@80x24.org>]

---
 load.c | 16 +++++++++++-----
 ruby.c |  8 +++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/load.c b/load.c
index 9025a89c87..9599b5266e 100644
--- a/load.c
+++ b/load.c
@@ -675,13 +675,22 @@ rb_provide(const char *feature)
 
 NORETURN(static void load_failed(VALUE));
 
+static void fls_close(struct ruby_file_load_state *fls)
+{
+    if (fls->filev == Qfalse) return;
+    rb_io_close(fls->filev);
+    fls->filev = Qfalse;
+}
+
 static inline void
 load_iseq_eval(rb_execution_context_t *ec, VALUE fname,
                 struct ruby_file_load_state *fls)
 {
     const rb_iseq_t *iseq = rb_iseq_load_iseq(fname);
 
-    if (!iseq) {
+    if (iseq) {
+        fls_close(fls);
+    } else {
         rb_execution_context_t *ec = GET_EC();
         VALUE v = rb_vm_push_frame_fname(ec, fname);
         rb_ast_t *ast;
@@ -1210,10 +1219,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
                     break;
 
                   case 's':
-                    if (fls.filev != Qfalse) {
-                        rb_io_close(fls.filev);
-                        fls.filev = Qfalse;
-                    }
+                    fls_close(&fls);
                     reset_ext_config = true;
                     ext_config_push(th, &prev_ext_config);
                     handle = (long)rb_vm_call_cfunc(rb_vm_top_self(), load_ext,
diff --git a/ruby.c b/ruby.c
index 057589db73..b32b845777 100644
--- a/ruby.c
+++ b/ruby.c
@@ -2545,19 +2545,21 @@ rb_parser_load_state(VALUE parser, VALUE fname_v,
 {
     if (fls->filev != Qfalse) {
         ruby_cmdline_options_t opt;
+        VALUE f = fls->filev;
 
+        fls->filev = Qfalse;
         cmdline_options_init(&opt);
         /* TODO: xflag for DOSISH || __CYGWIN__ */
         if (fls->is_nonblock) {
             struct rb_io_t *fptr;
 
-            RB_IO_POINTER(fls->filev, fptr);
+            RB_IO_POINTER(f, fptr);
             disable_nonblock(fptr->fd);
         }
         if (fls->is_fifo) {
-            rb_io_wait(fls->filev, RB_INT2NUM(RUBY_IO_READABLE), Qnil);
+            rb_io_wait(f, RB_INT2NUM(RUBY_IO_READABLE), Qnil);
         }
-        return load_file(parser, fname_v, fls->filev, 0, &opt);
+        return load_file(parser, fname_v, f, 0, &opt);
     }
     return rb_parser_load_file(parser, fname_v);
 }