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

SCP: Fix DO command so that CALL will work after a CD has been processed

Browse source
This commit is contained in:
Mark Pizzolato 2018-09-28 20:33:32 -07:00
parent a40d23fd53
commit c640000b54
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scp.c
View file

@ -3469,6 +3469,8 @@ if ((fpin = fopen (do_arg[0], "r")) == NULL) { /* file failed to open?
return SCPE_OPENERR; /* return failure */ return SCPE_OPENERR; /* return failure */
} }
} }
else
strlcpy (cbuf, do_arg[0], sizeof (cbuf)); /* store name of successfully opened file */
if (flag >= 0) { /* Only bump nesting from command or nested */ if (flag >= 0) { /* Only bump nesting from command or nested */
++sim_do_depth; ++sim_do_depth;
if (sim_on_inherit) { /* inherit ON condition actions? */ if (sim_on_inherit) { /* inherit ON condition actions? */
@ -3494,8 +3496,11 @@ if (flag >= 0) { /* Only bump nesting fro
} }
sim_debug (SIM_DBG_DO, sim_dflt_dev, "do_cmd_label(%d, flag=%d, '%s', '%s')\n", sim_do_depth, flag, fcptr, label ? label : ""); sim_debug (SIM_DBG_DO, sim_dflt_dev, "do_cmd_label(%d, flag=%d, '%s', '%s')\n", sim_do_depth, flag, fcptr, label ? label : "");
strlcpy( sim_do_filename[sim_do_depth], do_arg[0], if (NULL == (c = sim_filepath_parts (cbuf, "f")))
sizeof (sim_do_filename[sim_do_depth])); /* stash away do file name for possible use by 'call' command */ return SCPE_MEM;
strlcpy( sim_do_filename[sim_do_depth], c,
sizeof (sim_do_filename[sim_do_depth])); /* stash away full path of do file name for possible use by 'call' command */
free (c);
sim_do_label[sim_do_depth] = label; /* stash away do label for possible use in messages */ sim_do_label[sim_do_depth] = label; /* stash away do label for possible use in messages */
sim_goto_line[sim_do_depth] = 0; sim_goto_line[sim_do_depth] = 0;
if (label) { if (label) {