From 928193d463983d368c5cb5741c5dd5ade05abba9 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Thu, 27 Sep 2018 06:24:31 -0700 Subject: [PATCH] SCP: Fix EXPECT regular expression match environment variable names - Use sim_messagef for consistency --- doc/simh_doc.doc | Bin 267264 -> 264192 bytes scp.c | 15 +++++++++------ sim_disk.c | 10 ++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/simh_doc.doc b/doc/simh_doc.doc index d5ca93f03c4d4e5928f785e0df01f38d6ae18e52..d479c98ddec48cb6bf09a7d003cf1be62da13aa2 100644 GIT binary patch delta 38545 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

isz5wX`y(U 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 bs9GX8G`v#9%9TC}uKH1x=&w?z8m|36NqKC8 diff --git a/scp.c b/scp.c index fde93e04..bf30ced3 100644 --- a/scp.c +++ b/scp.c @@ -1963,7 +1963,7 @@ static const char simh_help[] = " If the expect rule was a regular expression rule, then the environment\n" " variable _EXPECT_MATCH_GROUP_0 is set to the whole string which matched\n" " and if the match pattern had any parentheses delimited sub-groups, the\n" - " environment variables _EXPECT_MATCH_PATTERN_1 thru _EXPECT_MATCH_PATTERN_n\n" + " environment variables _EXPECT_MATCH_GROUP_1 thru _EXPECT_MATCH_GROUP_n\n" " are set to the values within the string which matched the respective\n" " sub-groups.\n" /***************** 80 character line width template *************************/ @@ -3144,7 +3144,7 @@ t_stat help_cmd (int32 flag, CONST char *cptr) char gbuf[CBUFSIZE]; CTAB *cmdp; -GET_SWITCHES (cptr); +GET_SWITCHES (cptr); /* get switches */ if (sim_switches & SWMASK ('F')) flag = flag | SCP_HELP_FLAT; if (*cptr) { @@ -3322,7 +3322,7 @@ uint8 dbuf[4*CBUFSIZE]; uint32 dsize = 0; t_stat r; -GET_SWITCHES (cptr); +GET_SWITCHES (cptr); /* get switches */ tptr = get_glyph (cptr, gbuf, ','); if (sim_isalpha(gbuf[0]) && (strchr (gbuf, ':'))) { r = tmxr_locate_line (gbuf, &lp); @@ -6645,8 +6645,8 @@ t_stat reset_cmd (int32 flag, CONST char *cptr) char gbuf[CBUFSIZE]; DEVICE *dptr; -GET_SWITCHES (cptr); /* get switches */ run_cmd_did_reset = FALSE; +GET_SWITCHES (cptr); /* get switches */ if (*cptr == 0) /* reset(cr) */ return (reset_all (0)); cptr = get_glyph (cptr, gbuf, 0); /* get next glyph */ @@ -7895,7 +7895,6 @@ fflush(stdout); /* flush stdout */ if (sim_log) /* flush log if enabled */ fflush (sim_log); sim_throt_sched (); /* set throttle */ -sim_rtcn_init_all (); /* re-init clocks */ sim_start_timer_services (); /* enable wall clock timing */ do { @@ -8790,7 +8789,7 @@ DEVICE *dptr = sim_dflt_dev; int32 i, rdx, a, lim; t_stat r; -GET_SWITCHES (cptr); +GET_SWITCHES (cptr); /* get switches */ GET_RADIX (rdx, dptr->dradix); for (i = 0; i < sim_emax; i++) sim_eval[i] = 0; @@ -14333,11 +14332,13 @@ if (isalpha (*data) || (*data == '_')) { if (rptr) { *svalue = (t_svalue)get_rval (rptr, 0); sprint_val (string, *svalue, 10, string_size - 1, PV_LEFTSIGN); + sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); return TRUE; } gptr = _sim_get_env_special (data, string, string_size - 1); if (gptr) { *svalue = strtotsv(string, &gptr, 0); + sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); return ((*gptr == '\0') && (*string)); } else { @@ -14352,10 +14353,12 @@ if ((data[0] == '"') && (data_size > 1) && (data[data_size - 1] == '"')) strlcpy (string, data, string_size); if (string[0] == '\0') { *svalue = strtotsv(data, &gptr, 0); + sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); return ((*gptr == '\0') && (*data)); } sim_sub_args (string, string_size, sim_exp_argv); *svalue = strtotsv(string, &gptr, 0); +sim_debug (SIM_DBG_EXP_EVAL, sim_dflt_dev, "[Value: %s=%s]\n", data, string); return ((*gptr == '\0') && (*string)); } diff --git a/sim_disk.c b/sim_disk.c index 855ae0b1..5acbd1ba 100644 --- a/sim_disk.c +++ b/sim_disk.c @@ -1178,12 +1178,10 @@ if ((Scb.scb_w_cluster != Home.hm2_w_cluster) || (Scb.scb_b_strucver != Home.hm2_b_strucver) || (Scb.scb_b_struclev != Home.hm2_b_struclev)) goto Return_Cleanup; -if (!sim_quiet) { - sim_printf ("%s%d: '%s' Contains ODS%d File system\n", sim_dname (dptr), (int)(uptr-dptr->units), uptr->filename, Home.hm2_b_struclev); - sim_printf ("%s%d: Volume Name: %12.12s ", sim_dname (dptr), (int)(uptr-dptr->units), Home.hm2_t_volname); - sim_printf ("Format: %12.12s ", Home.hm2_t_format); - sim_printf ("Sectors In Volume: %u\n", Scb.scb_l_volsize); - } +sim_messagef (SCPE_OK, "%s%d: '%s' Contains ODS%d File system\n", sim_dname (dptr), (int)(uptr-dptr->units), uptr->filename, Home.hm2_b_struclev); +sim_messagef (SCPE_OK, "%s%d: Volume Name: %12.12s ", sim_dname (dptr), (int)(uptr-dptr->units), Home.hm2_t_volname); +sim_messagef (SCPE_OK, "Format: %12.12s ", Home.hm2_t_format); +sim_messagef (SCPE_OK, "Sectors In Volume: %u\n", Scb.scb_l_volsize); ret_val = ((t_offset)Scb.scb_l_volsize) * 512; Return_Cleanup: