SCP: Add VM-specific messages to %TSTATUS% expansion

Clean up variable expansion help
This commit is contained in:
Patrick Linstruth 2022-11-27 04:05:15 -08:00 committed by Paul Koning
parent 068b0f37b4
commit 92e40cb1c8

10
scp.c
View file

@ -1690,8 +1690,8 @@ static const char simh_help2[] =
" %%CTIME%%, %%DATE_YYYY%%, %%DATE_YY%%, %%DATE_YC%%, %%DATE_MM%%, %%DATE_MMM%%,\n" " %%CTIME%%, %%DATE_YYYY%%, %%DATE_YY%%, %%DATE_YC%%, %%DATE_MM%%, %%DATE_MMM%%,\n"
" %%DATE_MONTH%%, %%DATE_DD%%, %%DATE_D%%, %%DATE_WYYYY%%, %%DATE_WW%%,\n" " %%DATE_MONTH%%, %%DATE_DD%%, %%DATE_D%%, %%DATE_WYYYY%%, %%DATE_WW%%,\n"
" %%TIME_HH%%, %%TIME_MM%%, %%TIME_SS%%, %%TIME_MSEC%%, %%STATUS%%, %%TSTATUS%%,\n" " %%TIME_HH%%, %%TIME_MM%%, %%TIME_SS%%, %%TIME_MSEC%%, %%STATUS%%, %%TSTATUS%%,\n"
" %%SIM_VERIFY%%, %%SIM_QUIET%%, %%SIM_MESSAGE%% %%SIM_MESSAGE%%\n" " %%SIM_VERIFY%%, %%SIM_QUIET%%, %%SIM_MESSAGE%%, %%SIM_NAME%%, %%SIM_BIN_NAME%%,\n"
" %%SIM_NAME%%, %%SIM_BIN_NAME%%, %%SIM_BIN_PATH%%m %%SIM_OSTYPE%%\n\n" " %%SIM_BIN_PATH%%, %%SIM_OSTYPE%%\n\n"
"+Token %%0 expands to the command file name.\n" "+Token %%0 expands to the command file name.\n"
"+Token %%n (n being a single digit) expands to the n'th argument\n" "+Token %%n (n being a single digit) expands to the n'th argument\n"
"+Token %%* expands to the whole set of arguments (%%1 ... %%9)\n\n" "+Token %%* expands to the whole set of arguments (%%1 ... %%9)\n\n"
@ -4708,7 +4708,11 @@ if (!ap) { /* no environment variable found? */
ap = rbuf; ap = rbuf;
} }
else if (!strcmp ("TSTATUS", gbuf)) { else if (!strcmp ("TSTATUS", gbuf)) {
sprintf (rbuf, "%s", sim_error_text (sim_last_cmd_stat)); t_stat stat = SCPE_BARE_STATUS(sim_last_cmd_stat);
if ((stat > SCPE_OK) && (stat < SCPE_BASE) && (sim_stop_messages[stat] != NULL))
sprintf (rbuf, "%s", sim_stop_messages[stat]);
else
sprintf (rbuf, "%s", sim_error_text (stat));
ap = rbuf; ap = rbuf;
} }
else if (!strcmp ("SIM_VERIFY", gbuf)) { else if (!strcmp ("SIM_VERIFY", gbuf)) {