github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-11 23:52:58 +00:00
Code Releases Activity

CONSOLE: Add better support for SET CONSOLE TELNET=CONNECT

Browse Source 
- Some OS support had a bug in the command passed to run telnet in the
  new window.
- Report when there appears to be no telnet client available on the
  local system.
- Add support for Fedora KDE.
This commit is contained in:
Mark Pizzolato 2025-11-28 16:52:22 -10:00
parent 7c47a6be6d
commit 4fd9ded9ae
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sim_console.c
View File

@ -4292,20 +4292,26 @@ return SCPE_OK;
static t_stat sim_os_connect_telnet (int port) static t_stat sim_os_connect_telnet (int port)
{ {
char gbuf[CBUFSIZE]; char gbuf[CBUFSIZE];
const char *program = sim_get_tool_path ("osascript"); const char *program = sim_get_tool_path ("putty");
if (program[0] != '\0') {
snprintf (gbuf, sizeof (gbuf), "nohup putty telnet://localhost:%d 2>/dev/null&", port);
return spawn_cmd (0, gbuf);
}
program = sim_get_tool_path ("telnet");
if (program[0] == '\0') {
sim_messagef (SCPE_NOFNC, "Can't find a telnet program to connect to the console in a window\n");
return sim_messagef (SCPE_NOFNC, "You likely need to install the telnet client from your OS distribution\n");
}
program = sim_get_tool_path ("osascript");
if (program[0] != '\0') { if (program[0] != '\0') {
snprintf (gbuf, sizeof (gbuf), "osascript -e 'tell application \"Terminal\" to do script \"telnet localhost %d; exit\"'", port); snprintf (gbuf, sizeof (gbuf), "osascript -e 'tell application \"Terminal\" to do script \"telnet localhost %d; exit\"'", port);
return spawn_cmd (0, gbuf); return spawn_cmd (0, gbuf);
} }
program = sim_get_tool_path ("putty");
if (program[0] != '\0') {
snprintf (gbuf, sizeof (gbuf), "nohup putty telnet://localhost:%d' 2>/dev/null&", port);
return spawn_cmd (0, gbuf);
}
program = sim_get_tool_path ("gnome-terminal"); program = sim_get_tool_path ("gnome-terminal");
if (program[0] != '\0') { if (program[0] != '\0') {
snprintf (gbuf, sizeof (gbuf), "nohup gnome-terminal -- telnet localhost %d' 2>/dev/null&", port); snprintf (gbuf, sizeof (gbuf), "nohup gnome-terminal -- 'telnet localhost %d' 2>/dev/null&", port);
return spawn_cmd (0, gbuf); return spawn_cmd (0, gbuf);
} }
program = sim_get_tool_path ("uxterm"); program = sim_get_tool_path ("uxterm");
@ -4318,7 +4324,12 @@ if (program[0] != '\0') {
snprintf (gbuf, sizeof (gbuf), "nohup xterm -e 'telnet localhost %d' 2>/dev/null&", port); snprintf (gbuf, sizeof (gbuf), "nohup xterm -e 'telnet localhost %d' 2>/dev/null&", port);
return spawn_cmd (0, gbuf); return spawn_cmd (0, gbuf);
} }
return sim_messagef (SCPE_NOFNC, "Can't find a telnet program to connect to the console in a window\n"); program = sim_get_tool_path ("konsole");
if (program[0] != '\0') {
snprintf (gbuf, sizeof (gbuf), "nohup konsole -e 'telnet localhost %d' 2>/dev/null&", port);
return spawn_cmd (0, gbuf);
}
return sim_messagef (SCPE_NOFNC, "Can't find a way to create a window to run telnet in on this system\n");
} }
#endif #endif