nobu	2010-01-12 16:48:06 +0900 (Tue, 12 Jan 2010)

  New Revision: 26300

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26300

  Log:
    * ext/readline/readline.c (readline_readline): check if instream
      is closed instead of fd 0.
    
    * ext/readline/readline.c (Init_readline): use STDIN for input.
      http://d.hatena.ne.jp/codnote/20100111/1263174134

  Modified files:
    trunk/ChangeLog
    trunk/ext/readline/readline.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26299)
+++ ChangeLog	(revision 26300)
@@ -1,3 +1,11 @@
+Tue Jan 12 16:48:03 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/readline/readline.c (readline_readline): check if instream
+	  is closed instead of fd 0.
+
+	* ext/readline/readline.c (Init_readline): use STDIN for input.
+	  http://d.hatena.ne.jp/codnote/20100111/1263174134
+
 Tue Jan 12 16:09:02 2010  wanabe  <s.wanabe@g...>
 
 	* test/ruby/test_process.rb (test_execopts_env): MANDATORY_ENVS might
@@ -5,7 +13,7 @@
 
 Tue Jan 12 14:07:31 2010  NARUSE, Yui  <naruse@r...>
 
-	* lib/net/http.rb (Net::HTTP#start): add hash argument to
+	* lib/net/http.rb (Net::HTTP.start): add hash argument to
 	  set ssl related options. when use_ssl is set default value
 	  of verify_mode is OpenSSL::SSL::VERIFY_PEER. [ruby-dev:40003]
 
Index: ext/readline/readline.c
===================================================================
--- ext/readline/readline.c	(revision 26299)
+++ ext/readline/readline.c	(revision 26300)
@@ -247,7 +247,7 @@
 	prompt = RSTRING_PTR(tmp);
     }
 
-    if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin");
+    if (!isatty(fileno(rl_instream)) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin");
 
 #ifdef _WIN32
     rl_prep_terminal(1);
@@ -1463,4 +1463,6 @@
 #ifdef HAVE_RL_CLEAR_SIGNALS
     rl_clear_signals();
 #endif
+
+    readline_s_set_input(mReadline, rb_stdin);
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/