merge revision(s) 45130: [Backport ruby#9554]

nurse · nurse · commit aac2d826a21e · 2014-02-22T13:27:49.000Z
* ext/io/console/console.c (console_dev): need read access for conout$
	  because some functions need it.  [Bug#9554]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 22 22:26:43 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/io/console/console.c (console_dev): need read access for conout$
+	  because some functions need it.  [Bug#9554]
+
 Sat Feb 22 21:56:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_set_arguments): set arg_keyword_check from
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
@@ -710,7 +710,7 @@ console_dev(VALUE klass)
 	int fd;
 
 #ifdef CONSOLE_DEVICE_FOR_WRITING
-	fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_WRITING, O_WRONLY, 0);
+	fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_WRITING, O_RDWR, 0);
 	if (fd < 0) return Qnil;
         rb_update_max_fd(fd);
 	args[1] = INT2FIX(O_WRONLY);
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 74
+#define RUBY_PATCHLEVEL 75
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Sat Feb 22 22:26:43 2014  NAKAMURA Usaku  <[email protected]>
++
 +	* ext/io/console/console.c (console_dev): need read access for conout$
 +	  because some functions need it.  [Bug#9554]
++
 Sat Feb 22 21:56:26 2014  Nobuyoshi Nakada  <[email protected]>
 	* compile.c (iseq_set_arguments): set arg_keyword_check from