Exclude directories when locating tty, test etc (#948)

jline · Apr 17, 2024 · cfee77c · cfee77c
1 parent 6a620e7
commit cfee77c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/impl/exec/ExecTerminalProvider.java b/terminal/src/main/java/org/jline/terminal/impl/exec/ExecTerminalProvider.java
@@ -135,6 +135,7 @@ public boolean isPosixSystemStream(SystemStream stream) {
                     .start();
             return p.waitFor() == 0;
         } catch (Throwable t) {
+            Log.debug("ExecTerminalProvider failed 'test -t' for " + stream, t);
             // ignore
         }
         return false;

diff --git a/terminal/src/main/java/org/jline/utils/OSUtils.java b/terminal/src/main/java/org/jline/utils/OSUtils.java
@@ -51,6 +51,10 @@ public class OSUtils {
     public static String INFOCMP_COMMAND;
     public static String TEST_COMMAND;
 
+    private static boolean isExecutable(File f) {
+        return f.canExecute() && !f.isDirectory();
+    }
+
     static {
         boolean cygwinOrMsys = OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM;
         String suffix = cygwinOrMsys ? ".exe" : "";
@@ -64,19 +68,19 @@ public class OSUtils {
             String[] paths = path.split(File.pathSeparator);
             for (String p : paths) {
                 File ttyFile = new File(p, "tty" + suffix);
-                if (tty == null && ttyFile.canExecute()) {
+                if (tty == null && isExecutable(ttyFile)) {
                     tty = ttyFile.getAbsolutePath();
                 }
                 File sttyFile = new File(p, "stty" + suffix);
-                if (stty == null && sttyFile.canExecute()) {
+                if (stty == null && isExecutable(sttyFile)) {
                     stty = sttyFile.getAbsolutePath();
                 }
                 File infocmpFile = new File(p, "infocmp" + suffix);
-                if (infocmp == null && infocmpFile.canExecute()) {
+                if (infocmp == null && isExecutable(infocmpFile)) {
                     infocmp = infocmpFile.getAbsolutePath();
                 }
                 File testFile = new File(p, "test" + suffix);
-                if (test == null && testFile.canExecute()) {
+                if (test == null && isExecutable(testFile)) {
                     test = testFile.getAbsolutePath();
                 }
             }