matz

matz · matz · commit 87ba6143e6af · 2000-08-15T08:57:56.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Aug 15 17:30:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (frame_dup): should set flag FRAME_MALLOC after
+	  argv allocation.
+
+	* eval.c (blk_free): should not free argv if GC was called before
+	  frame_dup.
+
+Tue Aug 15 01:45:28 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_eof): should return true at the end of ARGF without
+	  checking stdout if arguments are given.
+
+Mon Aug 14 10:34:32 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_status): status should return false for normal
+	  termination, nil for termination by exception.
+
 Wed Aug  9 13:24:25 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 	* win32/win32.[ch]: emulate rename(2).
diff --git a/env.h b/env.h
@@ -22,10 +22,14 @@ extern struct FRAME {
     char *file;
     int line;
     int iter;
+    int flags;
 } *ruby_frame;
 
 void rb_gc_mark_frame _((struct FRAME *));
 
+#define FRAME_ALLOCA 0
+#define FRAME_MALLOC 1
+
 extern struct SCOPE {
     struct RBasic super;
     ID *local_tbl;
diff --git a/eval.c b/eval.c
@@ -429,6 +429,7 @@ static struct SCOPE *top_scope;
     _frame.cbase = ruby_frame->cbase;	\
     _frame.argc = 0;			\
     _frame.argv = 0;			\
+    _frame.flags = FRAME_ALLOCA;	\
     ruby_frame = &_frame;		\
 
 #define POP_FRAME()  			\
@@ -5488,7 +5489,7 @@ blk_free(data)
 
     frame = data->frame.prev;
     while (frame) {
-	if (frame->argc > 0)
+	if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
 	    free(frame->argv);
 	tmp = frame;
 	frame = frame->prev;
@@ -5534,6 +5535,7 @@ frame_dup(frame)
 	    argv = ALLOC_N(VALUE, frame->argc);
 	    MEMCPY(argv, frame->argv, VALUE, frame->argc);
 	    frame->argv = argv;
+	    frame->flags = FRAME_MALLOC;
 	}
 	frame->tmp = 0;		/* should not preserve tmp */
 	if (!frame->prev) break;
@@ -7259,9 +7261,9 @@ rb_thread_status(thread)
     rb_thread_t th = rb_thread_check(thread);
 
     if (rb_thread_dead(th)) {
-	if (NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
-	    return Qfalse;
-	return Qnil;
+	if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
+	    return Qnil;
+	return Qfalse;
     }
 
     return Qtrue;
diff --git a/io.c b/io.c
@@ -98,7 +98,7 @@ struct timeval rb_time_interval _((VALUE));
 
 static VALUE filename, current_file;
 static int gets_lineno;
-static int init_p = 0, next_p = 0;
+static int init_p = 0, next_p = 0, first_p = 1;
 static VALUE lineno;
 
 #ifdef _STDIO_USES_IOSTREAM  /* GNU libc */
@@ -2274,6 +2274,7 @@ next_argv()
 	    current_file = rb_stdin;
 	}
 	init_p = 1;
+	first_p = 0;
 	gets_lineno = 0;
     }
 
@@ -3084,8 +3085,13 @@ argf_readchar()
 static VALUE
 argf_eof()
 {
+    int first = first_p;
+
     if (init_p == 0 && !next_argv())
 	return Qtrue;
+    if (!first && next_p == -1) {
+	return Qtrue;
+    }
     if (TYPE(current_file) != T_FILE) {
 	return argf_forward();
     }
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
@@ -203,6 +203,7 @@ def transfercmd(cmd)
 	  raise FTPReplyError, resp
 	end
 	conn = sock.accept
+	sock.close
       end
       return conn
     end
