Do not use System.in directly

jline · Sep 5, 2017 · 60300ec · 60300ec
1 parent 9383ba1
commit 60300ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Commands.java b/builtins/src/main/java/org/jline/builtins/Commands.java
@@ -9,6 +9,7 @@
 package org.jline.builtins;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.time.LocalTime;
@@ -105,7 +106,7 @@ public static void nano(Terminal terminal, PrintStream out, PrintStream err,
         edit.run();
     }
 
-    public static void less(Terminal terminal, PrintStream out, PrintStream err,
+    public static void less(Terminal terminal, InputStream in, PrintStream out, PrintStream err,
                             Path currentDir,
                             String[] argv) throws IOException, InterruptedException {
         final String[] usage = {
@@ -148,7 +149,7 @@ public static void less(Terminal terminal, PrintStream out, PrintStream err,
         }
         for (String arg : opt.args()) {
             if ("-".equals(arg)) {
-                sources.add(new StdInSource());
+                sources.add(new StdInSource(in));
             } else {
                 sources.add(new URLSource(currentDir.resolve(arg).toUri().toURL(), arg));
             }

diff --git a/builtins/src/main/java/org/jline/builtins/Source.java b/builtins/src/main/java/org/jline/builtins/Source.java
@@ -101,7 +101,11 @@ public InputStream read() throws IOException {
     class StdInSource extends InputStreamSource {
 
         public StdInSource() {
-            super(System.in, false, null);
+            this(System.in);
+        }
+
+        public StdInSource(InputStream in) {
+            super(in, false, null);
         }
 
     }