Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various fixes #853

Merged
merged 5 commits into from
Aug 1, 2023
Merged

Various fixes #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c75ef6b
Use Objects.hashCode instead of Objects.hash to avoid vararg array cr…
turbanoff Jun 30, 2023
689facf
Fix TerminalProvider sorting
jvalkeal Jul 28, 2023
56efd75
Fix shell output going to stderr rather than stdout (fixes #845)
gnodet Jul 31, 2023
2428bb6
Fix detection of utilities (fixes #839)
gnodet Jul 31, 2023
f85d23c
Add a warning when using the ExecTerminalProvider on recent JDKs
gnodet Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reader/src/main/java/org/jline/reader/Candidate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(value);
return Objects.hashCode(value);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions terminal/src/main/java/org/jline/terminal/TerminalBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ private Terminal doBuild() throws IOException {
List<String> order = Arrays.asList(
System.getProperty(PROP_PROVIDERS, PROP_PROVIDERS_DEFAULT).split(","));
providers.sort(Comparator.comparing(l -> {
int idx = order.indexOf(l);
int idx = order.indexOf(l.name());
return idx >= 0 ? idx : Integer.MAX_VALUE;
}));

Expand Down Expand Up @@ -559,7 +559,7 @@ private Terminal doBuild() throws IOException {
color ? Terminal.TYPE_DUMB_COLOR : Terminal.TYPE_DUMB,
new FileInputStream(FileDescriptor.in),
new FileOutputStream(
console == TerminalProvider.Stream.Output ? FileDescriptor.out : FileDescriptor.err),
console == TerminalProvider.Stream.Error ? FileDescriptor.err : FileDescriptor.out),
encoding,
signalHandler);
}
Expand Down
13 changes: 13 additions & 0 deletions terminal/src/main/java/org/jline/terminal/impl/exec/ExecTerminalProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@
import org.jline.terminal.spi.Pty;
import org.jline.terminal.spi.TerminalProvider;
import org.jline.utils.ExecHelper;
import org.jline.utils.Log;
import org.jline.utils.OSUtils;

public class ExecTerminalProvider implements TerminalProvider {

private static boolean warned;

public String name() {
return "exec";
}
Expand Down Expand Up @@ -142,11 +145,21 @@ public String systemStreamName(Stream stream) {
return result.trim();
}
} catch (Throwable t) {
if ("java.lang.reflect.InaccessibleObjectException"
.equals(t.getClass().getName())
&& !warned) {
Log.warn(
"The ExecTerminalProvider requires the JVM options: '--add-opens java.base/java.lang=ALL-UNNAMED'");
warned = true;
}
// ignore
}
return null;
}

/**
* This requires --add-opens java.base/java.lang=ALL-UNNAMED
*/
private ProcessBuilder.Redirect getRedirect(FileDescriptor fd) throws ReflectiveOperationException {
// This is not really allowed, but this is the only way to redirect the output or error stream
// to the input. This is definitely not something you'd usually want to do, but in the case of
Expand Down
84 changes: 39 additions & 45 deletions terminal/src/main/java/org/jline/utils/OSUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,54 +46,48 @@ public class OSUtils {
public static String TEST_COMMAND;

static {
String tty;
String stty;
String sttyfopt;
String infocmp;
String test;
if (OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM) {
tty = null;
stty = null;
sttyfopt = null;
infocmp = null;
test = null;
String path = System.getenv("PATH");
if (path != null) {
String[] paths = path.split(";");
for (String p : paths) {
if (tty == null && new File(p, "tty.exe").exists()) {
tty = new File(p, "tty.exe").getAbsolutePath();
}
if (stty == null && new File(p, "stty.exe").exists()) {
stty = new File(p, "stty.exe").getAbsolutePath();
}
if (infocmp == null && new File(p, "infocmp.exe").exists()) {
infocmp = new File(p, "infocmp.exe").getAbsolutePath();
}
if (test == null && new File(p, "test.exe").exists()) {
test = new File(p, "test.exe").getAbsolutePath();
}
boolean cygwinOrMsys = OSUtils.IS_CYGWIN || OSUtils.IS_MSYSTEM;
String suffix = cygwinOrMsys ? ".exe" : "";
String tty = null;
String stty = null;
String sttyfopt = null;
String infocmp = null;
String test = null;
String path = System.getenv("PATH");
if (path != null) {
String[] paths = path.split(File.pathSeparator);
for (String p : paths) {
File ttyFile = new File(p, "tty" + suffix);
if (tty == null && ttyFile.canExecute()) {
tty = ttyFile.getAbsolutePath();
}
File sttyFile = new File(p, "stty" + suffix);
if (stty == null && sttyFile.canExecute()) {
stty = sttyFile.getAbsolutePath();
}
File infocmpFile = new File(p, "infocmp" + suffix);
if (infocmp == null && infocmpFile.canExecute()) {
infocmp = infocmpFile.getAbsolutePath();
}
File testFile = new File(p, "test" + suffix);
if (test == null && testFile.canExecute()) {
test = testFile.getAbsolutePath();
}
}
if (tty == null) {
tty = "tty.exe";
}
if (stty == null) {
stty = "stty.exe";
}
if (infocmp == null) {
infocmp = "infocmp.exe";
}
if (test == null) {
test = "test.exe";
}
} else {
tty = "tty";
stty = IS_OSX ? "/bin/stty" : "stty";
sttyfopt = IS_OSX ? "-f" : "-F";
infocmp = "infocmp";
test = "/bin/test";
}
if (tty == null) {
tty = "tty" + suffix;
}
if (stty == null) {
stty = "stty" + suffix;
}
if (infocmp == null) {
infocmp = "infocmp" + suffix;
}
if (test == null) {
test = "test" + suffix;
}
sttyfopt = IS_OSX ? "-f" : "-F";
TTY_COMMAND = tty;
STTY_COMMAND = stty;
STTY_F_OPTION = sttyfopt;
Expand Down
Loading