jruby · Feb 24, 2015 · Feb 24, 2015 · Feb 24, 2015
Showing with 33 additions and 5 deletions.

+10 −0 core/src/main/java/org/jruby/RubyGlobal.java

+14 −0 core/src/main/java/org/jruby/RubyIO.java

+7 −3 core/src/main/java/org/jruby/util/ShellLauncher.java

+2 −2 core/src/main/java/org/jruby/util/io/PosixShim.java
diff --git a/core/src/main/java/org/jruby/RubyGlobal.java b/core/src/main/java/org/jruby/RubyGlobal.java
@@ -64,6 +64,8 @@
 
 import static org.jruby.internal.runtime.GlobalVariable.Scope.*;
 
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.Channel;
@@ -283,9 +285,17 @@ private static Channel prepareStdioChannel(Ruby runtime, STDIO stdio, Object str
         } else {
             switch (stdio) {
                 case IN:
+                    if (stream instanceof FileInputStream) {
+                        return ((FileInputStream)stream).getChannel();
+                    }
+
                     return Channels.newChannel((InputStream)stream);
                 case OUT:
                 case ERR:
+                    if (stream instanceof FileOutputStream) {
+                        return ((FileOutputStream)stream).getChannel();
+                    }
+
                     return Channels.newChannel((OutputStream)stream);
                 default: throw new RuntimeException("invalid stdio: " + stdio);
             }

diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -182,6 +182,12 @@ public static RubyIO prepStdio(Ruby runtime, InputStream f, Channel c, int fmode
         RubyIO io = prepIO(runtime, c, fmode | OpenFile.PREP | EncodingUtils.DEFAULT_TEXTMODE, klass, path);
 
         fptr = io.getOpenFileChecked();
+
+        // Use standard stdio filenos if we're using System.in et al.
+        if (f == System.in) {
+            fptr.fd().realFileno = 0;
+        }
+
         prepStdioEcflags(fptr, fmode);
         fptr.stdio_file = f;
 
@@ -195,6 +201,14 @@ public static RubyIO prepStdio(Ruby runtime, OutputStream f, Channel c, int fmod
         RubyIO io = prepIO(runtime, c, fmode | OpenFile.PREP | EncodingUtils.DEFAULT_TEXTMODE, klass, path);
 
         fptr = io.getOpenFileChecked();
+
+        // Use standard stdio filenos if we're using System.in et al.
+        if (f == System.out) {
+            fptr.fd().realFileno = 1;
+        } else if (f == System.err) {
+            fptr.fd().realFileno = 2;
+        }
+
         prepStdioEcflags(fptr, fmode);
         fptr.stdio_file = f;
 

diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -866,9 +866,11 @@ public static InputStream unwrapBufferedStream(InputStream filteredStream) {
     public static OutputStream unwrapFilterOutputStream(OutputStream filteredStream) {
         while (filteredStream instanceof FilterOutputStream) {
             try {
-                filteredStream = (OutputStream)
+                OutputStream tmpStream = (OutputStream)
                         FieldAccess.getProtectedFieldValue(FilterOutputStream.class,
-                                "in", filteredStream);
+                                "out", filteredStream);
+                if (tmpStream == null) break;
+                filteredStream = tmpStream;
             } catch (Exception e) {
                 break; // break out if we've dug as deep as we can
             }
@@ -891,9 +893,11 @@ public static OutputStream unwrapFilterOutputStream(OutputStream filteredStream)
     public static InputStream unwrapFilterInputStream(InputStream filteredStream) {
         while (filteredStream instanceof FilterInputStream) {
             try {
-                filteredStream = (InputStream)
+                InputStream tmpStream = (InputStream)
                         FieldAccess.getProtectedFieldValue(FilterInputStream.class,
                                 "in", filteredStream);
+                if (tmpStream == null) break;
+                filteredStream = tmpStream;
             } catch (Exception e) {
                 break; // break out if we've dug as deep as we can
             }

diff --git a/core/src/main/java/org/jruby/util/io/PosixShim.java b/core/src/main/java/org/jruby/util/io/PosixShim.java
@@ -392,8 +392,8 @@ public Channel open(String cwd, String path, ModeFlags flags, int perm) {
     }
 
     public Channel open(String cwd, String path, ModeFlags flags, int perm, ClassLoader classLoader) {
-        if (path.equals("/dev/null") || path.equalsIgnoreCase("nul:") || path.equalsIgnoreCase("nul")) {
-            return new NullChannel();
+        if ((path.equals("/dev/null") || path.equalsIgnoreCase("nul")) && Platform.IS_WINDOWS) {
+            path = "nul:";
         }
 
         if (path.startsWith("classpath:/") && classLoader != null) {