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

gnodet · web-flow · commit ed5270693857 · 2024-04-17T16:59:27.000+02:00
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(

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static NativeWinSysTerminal createTerminal(`
`68`	`68`	`console = GetStdHandle(STD_ERROR_HANDLE);`
`69`	`69`	`break;`
`70`	`70`	`default:`
`71`		`- throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);`
	`71`	`+ throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);`
`72`	`72`	`}`
`73`	`73`	`java.lang.foreign.MemorySegment outMode = allocateInt(arena);`
`74`	`74`	`if (GetConsoleMode(console, outMode) == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public static FreeBsdNativePty current(TerminalProvider provider, SystemStream s`
`32`	`32`	`return new FreeBsdNativePty(`
`33`	`33`	`provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname());`
`34`	`34`	`default:`
`35`		`- throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);`
	`35`	`+ throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);`
`36`	`36`	`}`
`37`	`37`	`} catch (IOException e) {`
`38`	`38`	`throw new IOException("Not a tty", e);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static OsXNativePty current(TerminalProvider provider, SystemStream syste`
`48`	`48`	`FileDescriptor.err,`
`49`	`49`	`ttyname());`
`50`	`50`	`default:`
`51`		`- throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);`
	`51`	`+ throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);`
`52`	`52`	`}`
`53`	`53`	`} catch (IOException e) {`
`54`	`54`	`throw new IOException("Not a tty", e);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static FreeBsdNativePty current(TerminalProvider provider, SystemStream s`
`48`	`48`	`return new FreeBsdNativePty(`
`49`	`49`	`provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));`
`50`	`50`	`default:`
`51`		`- throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);`
	`51`	`+ throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static LinuxNativePty current(TerminalProvider provider, SystemStream sys`
`48`	`48`	`return new LinuxNativePty(`
`49`	`49`	`provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));`
`50`	`50`	`default:`
`51`		`- throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);`
	`51`	`+ throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static OsXNativePty current(TerminalProvider provider, SystemStream syste`
`40`	`40`	`return new OsXNativePty(`
`41`	`41`	`provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));`
`42`	`42`	`default:`
`43`		`- throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);`
	`43`	`+ throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static SolarisNativePty current(TerminalProvider provider, SystemStream s`
`39`	`39`	`return new SolarisNativePty(`
`40`	`40`	`provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));`
`41`	`41`	`default:`
`42`		`- throw new IllegalArgumentException("Unsupport stream for console: " + systemStream);`
	`42`	`+ throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`