Fix remote terminal on linux/bsd (fixes #962) (#968)

jline · Apr 17, 2024 · ed52706 · ed52706
1 parent 4545ba7
commit ed52706
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 39 deletions.
diff --git a/terminal-ffm/src/main/java/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java b/terminal-ffm/src/main/java/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
@@ -68,7 +68,7 @@ public static NativeWinSysTerminal createTerminal(
                     console = GetStdHandle(STD_ERROR_HANDLE);
                     break;
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
             java.lang.foreign.MemorySegment outMode = allocateInt(arena);
             if (GetConsoleMode(console, outMode) == 0) {

diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/freebsd/FreeBsdNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/freebsd/FreeBsdNativePty.java
@@ -32,7 +32,7 @@ public static FreeBsdNativePty current(TerminalProvider provider, SystemStream s
                     return new FreeBsdNativePty(
                             provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname());
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
         } catch (IOException e) {
             throw new IOException("Not a tty", e);

diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/linux/LinuxNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/linux/LinuxNativePty.java
@@ -32,7 +32,7 @@ public static LinuxNativePty current(TerminalProvider provider, SystemStream sys
                     return new LinuxNativePty(
                             provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname());
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
         } catch (IOException e) {
             throw new IOException("Not a tty", e);
@@ -55,15 +55,18 @@ public static LinuxNativePty open(TerminalProvider provider, Attributes attr, Si
         }
         String name = new String(buf, 0, len);
         return new LinuxNativePty(
-                provider,
-                null,
-                master[0],
-                newDescriptor(master[0]),
-                slave[0],
-                newDescriptor(slave[0]),
-                2,
-                FileDescriptor.err,
-                name);
+                provider, null, master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
+    }
+
+    public LinuxNativePty(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            int master,
+            FileDescriptor masterFD,
+            int slave,
+            FileDescriptor slaveFD,
+            String name) {
+        super(provider, systemStream, master, masterFD, slave, slaveFD, name);
     }
 
     public LinuxNativePty(

diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/osx/OsXNativePty.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/osx/OsXNativePty.java
@@ -48,7 +48,7 @@ public static OsXNativePty current(TerminalProvider provider, SystemStream syste
                             FileDescriptor.err,
                             ttyname());
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
         } catch (IOException e) {
             throw new IOException("Not a tty", e);

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/freebsd/FreeBsdNativePty.java
@@ -48,7 +48,7 @@ public static FreeBsdNativePty current(TerminalProvider provider, SystemStream s
                 return new FreeBsdNativePty(
                         provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
             default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
         }
     }
 

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/linux/LinuxNativePty.java
@@ -48,7 +48,7 @@ public static LinuxNativePty current(TerminalProvider provider, SystemStream sys
                 return new LinuxNativePty(
                         provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
             default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
         }
     }
 

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/osx/OsXNativePty.java
@@ -40,7 +40,7 @@ public static OsXNativePty current(TerminalProvider provider, SystemStream syste
                 return new OsXNativePty(
                         provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
             default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
         }
     }
 

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/solaris/SolarisNativePty.java
@@ -39,7 +39,7 @@ public static SolarisNativePty current(TerminalProvider provider, SystemStream s
                 return new SolarisNativePty(
                         provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
             default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
         }
     }
 

diff --git a/terminal-jni/src/main/java/org/jline/terminal/impl/jni/freebsd/FreeBsdNativePty.java b/terminal-jni/src/main/java/org/jline/terminal/impl/jni/freebsd/FreeBsdNativePty.java
@@ -32,7 +32,7 @@ public static FreeBsdNativePty current(TerminalProvider provider, SystemStream s
                     return new FreeBsdNativePty(
                             provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(2));
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
         } catch (IOException e) {
             throw new IOException("Not a tty", e);

diff --git a/terminal-jni/src/main/java/org/jline/terminal/impl/jni/linux/LinuxNativePty.java b/terminal-jni/src/main/java/org/jline/terminal/impl/jni/linux/LinuxNativePty.java
@@ -32,7 +32,7 @@ public static LinuxNativePty current(TerminalProvider provider, SystemStream sys
                     return new LinuxNativePty(
                             provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(2));
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
         } catch (IOException e) {
             throw new IOException("Not a tty", e);
@@ -55,15 +55,18 @@ public static LinuxNativePty open(TerminalProvider provider, Attributes attr, Si
         }
         String name = new String(buf, 0, len);
         return new LinuxNativePty(
-                provider,
-                null,
-                master[0],
-                newDescriptor(master[0]),
-                slave[0],
-                newDescriptor(slave[0]),
-                2,
-                FileDescriptor.err,
-                name);
+                provider, null, master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
+    }
+
+    public LinuxNativePty(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            int master,
+            FileDescriptor masterFD,
+            int slave,
+            FileDescriptor slaveFD,
+            String name) {
+        super(provider, systemStream, master, masterFD, slave, slaveFD, name);
     }
 
     public LinuxNativePty(

diff --git a/terminal-jni/src/main/java/org/jline/terminal/impl/jni/osx/OsXNativePty.java b/terminal-jni/src/main/java/org/jline/terminal/impl/jni/osx/OsXNativePty.java
@@ -48,7 +48,7 @@ public static OsXNativePty current(TerminalProvider provider, SystemStream syste
                             FileDescriptor.err,
                             ttyname(2));
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
         } catch (IOException e) {
             throw new IOException("Not a tty", e);

diff --git a/terminal-jni/src/main/java/org/jline/terminal/impl/jni/solaris/SolarisNativePty.java b/terminal-jni/src/main/java/org/jline/terminal/impl/jni/solaris/SolarisNativePty.java
@@ -32,7 +32,7 @@ public static SolarisNativePty current(TerminalProvider provider, SystemStream s
                     return new SolarisNativePty(
                             provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(2));
                 default:
-                    throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);
+                    throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
             }
         } catch (IOException e) {
             throw new IOException("Not a tty", e);
@@ -55,15 +55,7 @@ public static SolarisNativePty open(TerminalProvider provider, Attributes attr,
         }
         String name = new String(buf, 0, len);
         return new SolarisNativePty(
-                provider,
-                null,
-                master[0],
-                newDescriptor(master[0]),
-                slave[0],
-                newDescriptor(slave[0]),
-                2,
-                FileDescriptor.err,
-                name);
+                provider, null, master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
     }
 
     public SolarisNativePty(