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

Fixed conditions when error messages are displayed while processing do commands

Browse source
This commit is contained in:
Mark Pizzolato 2012-04-30 05:53:55 -07:00
parent 7830a327f0
commit ee235a6c37
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scp.c
View file

@ -71,9 +71,9 @@
Fixed bug in restoration with changed memory size Fixed bug in restoration with changed memory size
08-Mar-07 JDB Fixed breakpoint actions in DO command file processing 08-Mar-07 JDB Fixed breakpoint actions in DO command file processing
30-Jan-07 RMS Fixed bugs in get_ipaddr 30-Jan-07 RMS Fixed bugs in get_ipaddr
30-Aug-06 JDB detach_unit returns SCPE_UNATT if not attached
17-Oct-06 RMS Added idle support 17-Oct-06 RMS Added idle support
04-Oct-06 JDB DO cmd failure now echoes cmd unless -q 04-Oct-06 JDB DO cmd failure now echoes cmd unless -q
30-Aug-06 JDB detach_unit returns SCPE_UNATT if not attached
14-Jul-06 RMS Added sim_activate_abs 14-Jul-06 RMS Added sim_activate_abs
02-Jun-06 JDB Fixed do_cmd to exit nested files on assertion failure 02-Jun-06 JDB Fixed do_cmd to exit nested files on assertion failure
Added -E switch to do_cmd to exit on any error Added -E switch to do_cmd to exit on any error
@ -1202,8 +1202,8 @@ do {
fprintf (sim_log, "%s> %s\n", do_position(), ocptr); fprintf (sim_log, "%s> %s\n", do_position(), ocptr);
} }
} }
if ((flag <= 0) && /* report error if in cmdline/init file */ if ((staying || (flag <= 0)) && /* if not exiting or in cmdline/init file */
(stat >= SCPE_BASE) && !stat_nomessage) { (stat >= SCPE_BASE) && !stat_nomessage) { /* report error */
if (cmdp->message) { /* special message handler */ if (cmdp->message) { /* special message handler */
cmdp->message ((!echo && !sim_quiet) ? ocptr : NULL, stat); cmdp->message ((!echo && !sim_quiet) ? ocptr : NULL, stat);
} }
@ -3613,7 +3613,7 @@ if (unechoed_cmdline) {
printf("%s> %s\n", do_position(), unechoed_cmdline); printf("%s> %s\n", do_position(), unechoed_cmdline);
if (sim_log) if (sim_log)
fprintf (sim_log, "%s> %s\n", do_position(), unechoed_cmdline); fprintf (sim_log, "%s> %s\n", do_position(), unechoed_cmdline);
} }
fprint_stopped (stdout, r); /* print msg */ fprint_stopped (stdout, r); /* print msg */
if (sim_log) /* log if enabled */ if (sim_log) /* log if enabled */
fprint_stopped (sim_log, r); fprint_stopped (sim_log, r);