From 6f5d8d3ed04fa38445b7a449d464f33d9a5d162c Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sun, 7 Jul 2019 01:12:35 -0700 Subject: [PATCH] SCP: Honor -Q switch when enabling and disabling logging, suppress log date --- sim_console.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sim_console.c b/sim_console.c index 5b8c9960..41558b26 100644 --- a/sim_console.c +++ b/sim_console.c @@ -2202,13 +2202,14 @@ sim_set_logoff (0, NULL); /* close cur log */ r = sim_open_logfile (gbuf, FALSE, &sim_log, &sim_log_ref); /* open log */ if (r != SCPE_OK) /* error? */ return r; -if (!sim_quiet) +if ((!sim_quiet) && (!(sim_switches & SWMASK ('Q')))) fprintf (stdout, "Logging to file \"%s\"\n", sim_logfile_name (sim_log, sim_log_ref)); fprintf (sim_log, "Logging to file \"%s\"\n", sim_logfile_name (sim_log, sim_log_ref)); /* start of log */ time(&now); -fprintf (sim_log, "Logging to file \"%s\" at %s", sim_logfile_name (sim_log, sim_log_ref), ctime(&now)); +if ((!sim_quiet) && (!(sim_switches & SWMASK ('Q')))) + fprintf (sim_log, "Logging to file \"%s\" at %s", sim_logfile_name (sim_log, sim_log_ref), ctime(&now)); return SCPE_OK; } @@ -2220,7 +2221,7 @@ if (cptr && (*cptr != 0)) /* now eol? */ return SCPE_2MARG; if (sim_log == NULL) /* no log? */ return SCPE_OK; -if (!sim_quiet) +if ((!sim_quiet) && (!(sim_switches & SWMASK ('Q')))) fprintf (stdout, "Log file closed\n"); fprintf (sim_log, "Log file closed\n"); sim_close_logfile (&sim_log_ref); /* close log */