Use ttyname() with jansi-native > 1.6

jline · Mar 17, 2017 · baac2b0 · baac2b0
1 parent 33eb5d4
commit baac2b0
Showing 1 changed file with 47 additions and 2 deletions.
diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiNativePty.java
@@ -20,6 +20,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static org.fusesource.jansi.internal.CLibrary.TCSANOW;
 import static org.jline.utils.ExecHelper.exec;
@@ -40,9 +44,50 @@ public JansiNativePty(int master, FileDescriptor masterFD, int slave, FileDescri
         this.slaveFD = slaveFD;
     }
 
+    static final boolean useTtyName;
+    static {
+        boolean doUseTtyName = false;
+        try {
+            URL url = CLibrary.class.getClassLoader().getResource("META-INF/maven/org.fusesource.jansi/jansi-native/pom.properties");
+            if (url != null) {
+                Properties props = new Properties();
+                try (InputStream is = url.openStream()) {
+                    props.load(is);
+                }
+                String v = props.getProperty("version");
+                if (v != null) {
+                    Matcher m =  Pattern.compile("([0-9]+)\\.([0-9]+)([\\.-]\\S+)?").matcher(v);
+                    if (m.matches()) {
+                        int major = Integer.parseInt(m.group(1));
+                        int minor = Integer.parseInt(m.group(2));
+                        doUseTtyName = major > 1 || major == 1 && minor > 6;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            // Ignore
+        }
+        useTtyName = doUseTtyName;
+    }
+
     protected static String ttyname() throws IOException {
-        String name = exec(true, OSUtils.TTY_COMMAND);
-        return name.trim();
+        if (useTtyName) {
+            String name = CLibrary.ttyname(0);
+            if (name != null) {
+                name = name.trim();
+            }
+            if (name == null || name.isEmpty()) {
+                throw new IOException("Not a tty");
+            }
+            return name;
+        } else {
+            try {
+                String name = exec(true, OSUtils.TTY_COMMAND);
+                return name.trim();
+            } catch (IOException e) {
+                throw new IOException("Not a tty", e);
+            }
+        }
     }
 
     @Override