github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-04-17 00:36:00 +00:00
Code Releases Activity

CONSOLE: enable Log, and Debug to use caseindependent STDOUT and STDERR

Browse Source 
- Avoid tmios debug output when not on macOS
This commit is contained in:
Mark Pizzolato
2025-08-30 19:59:31 -10:00
parent 5c39a0d6e1
commit f4dbd05b59
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sim_console.c
View File

@@ -2785,7 +2785,7 @@ if (*tptr != 0) /* now eol? */
return SCPE_2MARG; return SCPE_2MARG;
sim_close_logfile (pref); sim_close_logfile (pref);
*pf = NULL; *pf = NULL;
if (strcmp (gbuf, "LOG") == 0) { /* output to log? */ if (sim_strcasecmp (gbuf, "LOG") == 0) { /* output to log? */
if (sim_log == NULL) /* any log? */ if (sim_log == NULL) /* any log? */
return SCPE_ARG; return SCPE_ARG;
*pf = sim_log; *pf = sim_log;
@@ -2793,7 +2793,7 @@ if (strcmp (gbuf, "LOG") == 0) { /* output to log? */
if (*pref) if (*pref)
++(*pref)->refcount; ++(*pref)->refcount;
} }
else if (strcmp (gbuf, "DEBUG") == 0) { /* output to debug? */ else if (sim_strcasecmp (gbuf, "DEBUG") == 0) { /* output to debug? */
if (sim_deb == NULL) /* any debug? */ if (sim_deb == NULL) /* any debug? */
return SCPE_ARG; return SCPE_ARG;
*pf = sim_deb; *pf = sim_deb;
@@ -2801,11 +2801,11 @@ else if (strcmp (gbuf, "DEBUG") == 0) { /* output to debug? */
if (*pref) if (*pref)
++(*pref)->refcount; ++(*pref)->refcount;
} }
else if (strcmp (gbuf, "STDOUT") == 0) { /* output to stdout? */ else if (sim_strcasecmp (gbuf, "STDOUT") == 0) { /* output to stdout? */
*pf = stdout; *pf = stdout;
*pref = NULL; *pref = NULL;
} }
else if (strcmp (gbuf, "STDERR") == 0) { /* output to stderr? */ else if (sim_strcasecmp (gbuf, "STDERR") == 0) { /* output to stderr? */
*pf = stderr; *pf = stderr;
*pref = NULL; *pref = NULL;
} }
@@ -4054,7 +4054,7 @@ BITFIELD tmio_lcl_bits[] = {
ENDBITS ENDBITS
}; };
static char *tmio_cc[NCCS] = { static const char *tmio_cc[] = {
"VEOF", "VEOF",
"VEOL", "VEOL",
#if defined(_POSIX_C_SOURCE) && !defined(_DARWIN_C_SOURCE) #if defined(_POSIX_C_SOURCE) && !defined(_DARWIN_C_SOURCE)
@@ -4097,6 +4097,12 @@ static char *tmio_cc[NCCS] = {
static void _tmio_debug (const char *name, struct termios *ttyset) static void _tmio_debug (const char *name, struct termios *ttyset)
{ {
/* The tmio_cc and various flag bits were specifically relevant */
/* while troubleshooting under macOS and bits and tmio_cc */
/* indexes are derived from the macOS termios.h and potentially */
/* confusing elsewhere, so this routine does nothing except when */
/* running there. */
#if defined(__APPLE__)
int i; int i;
sim_debug (DBG_SET, &sim_con_telnet, "%s.c_iflag = 0x%08X ", name, (uint32)(ttyset->c_iflag)); sim_debug (DBG_SET, &sim_con_telnet, "%s.c_iflag = 0x%08X ", name, (uint32)(ttyset->c_iflag));
@@ -4116,6 +4122,7 @@ for (i = 0; i < NCCS; i++) {
sim_debug (DBG_SET, &sim_con_telnet, "'\\%03o'\n", ttyset->c_cc[i]&0xFF); sim_debug (DBG_SET, &sim_con_telnet, "'\\%03o'\n", ttyset->c_cc[i]&0xFF);
} }
} }
#endif
} }
static t_stat sim_os_ttinit (void) static t_stat sim_os_ttinit (void)