nobu	2010-02-28 21:32:39 +0900 (Sun, 28 Feb 2010)

  New Revision: 26786

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

  Log:
    * ext/pty/pty.c (get_device_once): raise on error when fail is
      non-zero.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/pty/pty.c
    trunk/ChangeLog
    trunk/ext/pty/pty.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26785)
+++ ChangeLog	(revision 26786)
@@ -1,3 +1,8 @@
+Sun Feb 28 21:32:36 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/pty/pty.c (get_device_once): raise on error when fail is
+	  non-zero.
+
 Sun Feb 28 18:58:00 2010  Kenta Murata  <mrkn@m...>
 
 	* math.c (rb_eMathDomainError): new exception class
Index: ext/pty/pty.c
===================================================================
--- ext/pty/pty.c	(revision 26785)
+++ ext/pty/pty.c	(revision 26786)
@@ -319,7 +319,7 @@
   error:
     if (slavefd != -1) close(slavefd);
     if (masterfd != -1) close(masterfd);
-    if (!fail) {
+    if (fail) {
         rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     }
     return -1;
@@ -383,7 +383,7 @@
   error:
     if (slavefd != -1) close(slavefd);
     if (masterfd != -1) close(masterfd);
-    if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
+    if (fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     return -1;
 #else
     int	 masterfd = -1, slavefd = -1;
Index: ruby_1_8/ext/pty/pty.c
===================================================================
--- ruby_1_8/ext/pty/pty.c	(revision 26785)
+++ ruby_1_8/ext/pty/pty.c	(revision 26786)
@@ -369,7 +369,7 @@
 	}
 	close(i);
     }
-    if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
+    if (fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     return -1;
 #else
     const char *const *p;
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26785)
+++ ruby_1_8/ChangeLog	(revision 26786)
@@ -1,3 +1,8 @@
+Sun Feb 28 21:32:36 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/pty/pty.c (get_device_once): raise on error when fail is
+	  non-zero.
+
 Sun Feb 28 15:12:37 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/open3.rb (Open3#popen3): ignore trap and at_exit also when

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