folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Honor -Q switch when enabling and disabling logging, suppress log date

Browse source
This commit is contained in:
Mark Pizzolato 2019-07-07 01:12:35 -07:00
parent 24ed486222
commit 6f5d8d3ed0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sim_console.c
View file

@ -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 */ r = sim_open_logfile (gbuf, FALSE, &sim_log, &sim_log_ref); /* open log */
if (r != SCPE_OK) /* error? */ if (r != SCPE_OK) /* error? */
return r; return r;
if (!sim_quiet) if ((!sim_quiet) && (!(sim_switches & SWMASK ('Q'))))
fprintf (stdout, "Logging to file \"%s\"\n", fprintf (stdout, "Logging to file \"%s\"\n",
sim_logfile_name (sim_log, sim_log_ref)); sim_logfile_name (sim_log, sim_log_ref));
fprintf (sim_log, "Logging to file \"%s\"\n", fprintf (sim_log, "Logging to file \"%s\"\n",
sim_logfile_name (sim_log, sim_log_ref)); /* start of log */ sim_logfile_name (sim_log, sim_log_ref)); /* start of log */
time(&now); 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; return SCPE_OK;
} }
@ -2220,7 +2221,7 @@ if (cptr && (*cptr != 0)) /* now eol? */
return SCPE_2MARG; return SCPE_2MARG;
if (sim_log == NULL) /* no log? */ if (sim_log == NULL) /* no log? */
return SCPE_OK; return SCPE_OK;
if (!sim_quiet) if ((!sim_quiet) && (!(sim_switches & SWMASK ('Q'))))
fprintf (stdout, "Log file closed\n"); fprintf (stdout, "Log file closed\n");
fprintf (sim_log, "Log file closed\n"); fprintf (sim_log, "Log file closed\n");
sim_close_logfile (&sim_log_ref); /* close log */ sim_close_logfile (&sim_log_ref); /* close log */