8327476: Upgrade JLine to 3.26.1

Reviewed-by: mdoerr
Backport-of: aaa90b3005c85852971203ce6feb88e7091e167b

Author: GoeLin

src/jdk.internal.le/aix/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java

@@ -27,15 +27,16 @@
 import java.io.IOException;
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
 class JDKNativePty {
 
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
+    static JnaNativePty current(TerminalProvider provider, SystemStream systemStream) throws IOException {
         throw new UnsupportedOperationException("Not supported.");
     }
 
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
+    static JnaNativePty open(TerminalProvider provider, Attributes attr, Size size) throws IOException {
         throw new UnsupportedOperationException("Not supported.");
     }
 

src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/JDKNativePty.java

@@ -28,16 +28,17 @@
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.impl.jna.linux.LinuxNativePty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
 class JDKNativePty {
 
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        return LinuxNativePty.current(console);
+    static JnaNativePty current(TerminalProvider provider, SystemStream systemStream) throws IOException {
+        return LinuxNativePty.current(provider, systemStream);
     }
 
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        return LinuxNativePty.open(attr, size);
+    static JnaNativePty open(TerminalProvider provider, Attributes attr, Size size) throws IOException {
+        return LinuxNativePty.open(provider, attr, size);
     }
 
     static int isatty(int fd) {

src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/CLibrary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2020, the original author or authors.
+ * Copyright (c) 2002-2020, the original author(s).
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -11,15 +11,17 @@
 import java.io.FileDescriptor;
 import java.io.IOException;
 
-//import com.sun.jna.LastErrorException;
-//import com.sun.jna.Native;
-//import com.sun.jna.Platform;
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.impl.jna.JnaNativePty;
 import jdk.internal.org.jline.terminal.impl.jna.LastErrorException;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
+//import com.sun.jna.LastErrorException;
+//import com.sun.jna.Native;
+//import com.sun.jna.Platform;
+
 import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TCSADRAIN;
 import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TIOCGWINSZ;
 import static jdk.internal.org.jline.terminal.impl.jna.linux.CLibrary.TIOCSWINSZ;
@@ -33,44 +35,63 @@ public class LinuxNativePty extends JnaNativePty {
 
     public interface UtilLibrary {// extends com.sun.jna.Library {
 
-        void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s) throws LastErrorException;
+        void openpty(int[] master, int[] slave, byte[] name, CLibrary.termios t, CLibrary.winsize s)
+                throws LastErrorException;
 
 //        UtilLibrary INSTANCE = Native.load("util", UtilLibrary.class);
         UtilLibrary INSTANCE = new UtilLibraryImpl();
     }
 
-    public static LinuxNativePty current(TerminalProvider.Stream consoleStream) throws IOException {
-        switch (consoleStream) {
+    public static LinuxNativePty current(TerminalProvider provider, SystemStream systemStream) throws IOException {
+        switch (systemStream) {
             case Output:
-                return new LinuxNativePty(-1, null, 0, FileDescriptor.in, 1, FileDescriptor.out, ttyname(0));
+                return new LinuxNativePty(
+                        provider, systemStream, -1, null, 0, FileDescriptor.in, 1, FileDescriptor.out, ttyname(0));
             case Error:
-                return new LinuxNativePty(-1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
+                return new LinuxNativePty(
+                        provider, systemStream, -1, null, 0, FileDescriptor.in, 2, FileDescriptor.err, ttyname(0));
             default:
-                throw new IllegalArgumentException("Unsupport stream for console: " + consoleStream);
+                throw new IllegalArgumentException("Unsupported stream for console: " + systemStream);
         }
     }
 
-    public static LinuxNativePty open(Attributes attr, Size size) throws IOException {
+    public static LinuxNativePty open(TerminalProvider provider, Attributes attr, Size size) throws IOException {
         int[] master = new int[1];
         int[] slave = new int[1];
         byte[] buf = new byte[64];
-        UtilLibrary.INSTANCE.openpty(master, slave, buf,
-                attr != null ? new termios(attr) : null,
-                size != null ? new winsize(size) : null);
+        UtilLibrary.INSTANCE.openpty(
+                master, slave, buf, attr != null ? new termios(attr) : null, size != null ? new winsize(size) : null);
         int len = 0;
         while (buf[len] != 0) {
             len++;
         }
         String name = new String(buf, 0, len);
-        return new LinuxNativePty(master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
+        return new LinuxNativePty(
+                provider, null, master[0], newDescriptor(master[0]), slave[0], newDescriptor(slave[0]), name);
     }
 
-    public LinuxNativePty(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, String name) {
-        super(master, masterFD, slave, slaveFD, 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(int master, FileDescriptor masterFD, int slave, FileDescriptor slaveFD, int slaveOut, FileDescriptor slaveOutFD, String name) {
-        super(master, masterFD, slave, slaveFD, slaveOut, slaveOutFD, name);
+    public LinuxNativePty(
+            TerminalProvider provider,
+            SystemStream systemStream,
+            int master,
+            FileDescriptor masterFD,
+            int slave,
+            FileDescriptor slaveFD,
+            int slaveOut,
+            FileDescriptor slaveOutFD,
+            String name) {
+        super(provider, systemStream, master, masterFD, slave, slaveFD, slaveOut, slaveOutFD, name);
     }
 
     @Override
@@ -118,5 +139,4 @@ public static String ttyname(int slave) {
         }
         return new String(buf, 0, len);
     }
-
 }

src/jdk.internal.le/linux/classes/jdk/internal/org/jline/terminal/impl/jna/linux/LinuxNativePty.java

@@ -28,16 +28,17 @@
 import jdk.internal.org.jline.terminal.Attributes;
 import jdk.internal.org.jline.terminal.Size;
 import jdk.internal.org.jline.terminal.impl.jna.osx.OsXNativePty;
+import jdk.internal.org.jline.terminal.spi.SystemStream;
 import jdk.internal.org.jline.terminal.spi.TerminalProvider;
 
 class JDKNativePty {
 
-    static JnaNativePty current(TerminalProvider.Stream console) throws IOException {
-        return OsXNativePty.current(console);
+    static JnaNativePty current(TerminalProvider provider, SystemStream systemStream) throws IOException {
+        return OsXNativePty.current(provider, systemStream);
     }
 
-    static JnaNativePty open(Attributes attr, Size size) throws IOException {
-        return OsXNativePty.open(attr, size);
+    static JnaNativePty open(TerminalProvider provider, Attributes attr, Size size) throws IOException {
+        return OsXNativePty.open(provider, attr, size);
     }
 
     static int isatty(int fd) {