Reapply fix from #1198 to fix #3292. Unsure how to test this.

jruby · Sep 3, 2015 · aae72b5 · aae72b5
1 parent 1cbb8d6
commit aae72b5
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/util/io/OpenFile.java b/core/src/main/java/org/jruby/util/io/OpenFile.java
@@ -2029,20 +2029,26 @@ private void unreadWindows(ThreadContext context) {
         return;
     }
 
-    // io_fwrite
+    // MRI: io_fwrite
     public long fwrite(ThreadContext context, IRubyObject str, boolean nosync) {
-        // TODO: Windows
-//        #ifdef _WIN32
-//        if (fptr->mode & FMODE_TTY) {
-//            long len = rb_w32_write_console(str, fptr->fd);
-//            if (len > 0) return len;
-//        }
-//        #endif
+        if (Platform.IS_WINDOWS && isStdio()) {
+            return rbW32WriteConsole((RubyString)str);
+        }
+
         str = doWriteconv(context, str);
         ByteList strByteList = ((RubyString)str).getByteList();
         return binwrite(context, str, strByteList.unsafeBytes(), strByteList.begin(), strByteList.length(), nosync);
     }
 
+    // MRI: rb_w32_write_console
+    public static long rbW32WriteConsole(RubyString buffer) {
+        // The actual port in MRI uses win32 APIs, but System.console seems to do what we want. See jruby/jruby#3292.
+        // FIXME: This assumes the System.console() is the right one to write to. Can you have multiple active?
+        System.console().printf("%s", buffer.asJavaString());
+
+        return buffer.size();
+    }
+
     // do_writeconv
     public IRubyObject doWriteconv(ThreadContext context, IRubyObject str)
     {