From c8a420ad480773e21f791d1a024c48184937cd42 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sat, 16 Sep 2017 17:05:26 -0700
Subject: [PATCH] SCP: Change command argument processing of %% and \% to be
 consistent.

%% now inserts a bare % and \\ only means something when parsing a quoted
string argument (used by EXPECT and SEND commands).

Additionally, EXPECT and BREAK commands have action steps which will now
expand arguments as each of the actions are executed rather than when the
EXPECT or BREAK command is defined.
---
 README.md        |   4 ++--
 doc/simh_doc.doc | Bin 270848 -> 275968 bytes
 scp.c            |  60 +++++++++++++++++++++++++++++++++++------------
 3 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 69894f5b..98dafabc 100644
--- a/README.md
+++ b/README.md
@@ -319,8 +319,8 @@ Built In variables %DATE%, %TIME%, %DATETIME%, %LDATE%, %LTIME%, %CTIME%, %DATE_
    Token %n (n being a single digit) expands to the n'th argument
    Token %* expands to the whole set of arguments (%1 ... %9)
 
-   The input sequence "\%" represents a literal "%", and "\\" represents a
-   literal "\".  All other character combinations are rendered literally.
+   The input sequence "%%" represents a literal "%".  All other 
+   character combinations are rendered literally.
 
    Omitted parameters result in null-string substitutions.
 
diff --git a/doc/simh_doc.doc b/doc/simh_doc.doc
index 7a9fea6a6d5908f4e138897f848dbfa2418649b2..6783e2dbaf024aacc180cc2e8c5b0703917f4fd4 100644
GIT binary patch
delta 23985
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
SJLVNRJ9g-xPiPoZV)=jc{l`22

delta 20858
zcmc(n33wF6w#Tb_CLse!$b=+7NJ2IsAPJf2Y{Mp-iU>-sh=}ZhA|fJ-C~z6zA)vB|
z4RjD$uTMbqDxkFcMN#BaM8vota#;k|$i55l{m*oFrn{#n#Ctz@<M(r_&N;R8sZ-rm
zHBF{g#7+G$?&<vG+5%HQag4<v&5^78^UpsSlVfw7Ns1@mxspF4q=@To=PZ^D88Ku;
z^0MS*S|P)i%bCRTA|33}b9eV6*4@J8_t)@LX{7LszdNceNMUS71Y<uZtEC1lVQeT`
zd?SOgo>7cNwNT~ZzJGweQzT<eJdEu?eJ8xA3q@WpV~j3B!8d(uzSWwIifkBuxRkNY
zC^>OCV^fgdiwY8@QlVb$a;=MdL}ZgPsb%`;-+M$guYd0?lP)>Z{CdY#rFubokvWcf
z3-H~sMAcZoshSzMAiY(+9&4U1)cDcs(PZ+@HN1JA-luTJR4CR7?=6J)1UX}h(9Qpt
zR<YhNh9BdP&qE)dJ(c<;x~6_~dH+Jjw!?9IWQ?4y#P=%HlYsARjBHzc(+Jb2Ipkz_
z9*(9@6Z8SW5Xi4&%)uTjqmJC#NjD%P`sf~@4(1@QU!4A}dqB_c5h>)FW(M<tYO2c7
z2-9b8S-?){SQ7a5g|pW$Ae?@W)Tq`9uiophR+ex<FLAZ)-68gy+C=T+k>0}Gj^pp!
zlvevdL@iH&=<}9{Qbb%vRXR5=Jw}xmWTx{3k4yTqX@)c@&aGJ#NU+e-h0<GbZL89k
z<I<zml0|`%(g}Axsja(#W>6&E?M`>A2E_q`JZ~PVzqNB?X}w#ozL>1E5+%~F?!u~c
zQ0|j@#OG^rpVYRVX79_F*6VVlgL04Ls@GDr_jyR38|a14OT7?XogaGe!NH@3j&;>b
z@7eLD8~%2~jp+k>J#<fjPqUJ`C+IDR(yR3fw3<Yc*Hvu-t`hUSE@^(>WT|hWb~U~N
zL)k)UY(fjIY@t*)QLnQ|`ZS@PCNDC`i>0E(!dSKb;`DyQX)vS{S;?AdiS%ru<^*4f
z^hKgJf<B*gAyMz5uSzcF=S%&PS_jHf8uo#%i}{{_6Y@%2QpcG|RpSh~^m%=?PBGsr
zWz|=^Na>(ll;+p>X?2PQd4Y7Uep5|eV2~F|-5aO_A?6oKUo_C`FOt?Y$kObK4Dw>>
zLW4X_UM%G`)a^^8-iCBg?vq}qlKX=8o_y(SL)BLz(y)&sw~8L^+C7NEm1`PG6Oz?&
zgF>30tTpEGN=mZkIHZGeQA%&rJ}^F_N30s3dg}Oyo&srZqvmSgk$$(4UR|Mdq*0Dm
ztWYiHtr}L*QzW%bX{Hq`l18NH#fqh8QaqZxSb92DmzPK<Q`9*kdP)p(pVT{5)a-ph
zxi?>WBQ;l*BVD1_<Ml`hY1e6Tk90XrtKaLDMx|->ARUy8(ylaZh`pjgULZATT%y%e
zV2~F|a~fxB@<M~WNZQ}Hl^TlPBF!De(t?bJnr*SvE<Ib*YqP*>)Z?1d^EG{mO?jVm
zEM4=D*C$<{sa=<tFWsKeN^Jw_pxh&E$k6OXk3sI05;L_B6}<+zDBYLYM5{+M$P1*m
zGqrIP3k>o?$(^P7O)Qk!XX*VZlI}I6gYsf&bCxz<VzKmVRz{sb=!zvYZRNKTd7jiI
zTMJvUMCzBVSLl;wWa}OCZF)8P_`AHHwCYf!%$Di6*`;Up>zA26X4vR4!^RF9HEwMB
z;PjFAj~g~-@JMJjy?rQaY!uc^4MDQ(?#*v$UO$$xlSfW|yL0Q#cXz(L>g9P;CrlkY
zuk^-Zmg*Qm4?TC(w4~vk96!n(`}4#UB-n#pnR65vAH`YY#NoNz!BmU5fjl{$%0xzS
zqkKz$o{;7a*cb~pGTKDn$s4+YRZ$VS)1CY&2Q|IxPTq<qzR-sYva>ILH1*66<!8#@
zfBF3ti&sp2fAq_v&y=4TP$i*fb2Is^zC1pSdV5C{H*`3(zZdQM+q(Mxvixohjn~pF
zad=5liROn<5>Jt*-pyUs3)(S|M>h-YRF)7m%`xKdYDY}|j<fhXb#XtwI^dF3&+x?f
zqgYM-2fnWC$1?+!G?sXyK*DxxL#`>>>b(T{pZ%>@nPs@>ivIi?LpCs|2L{w=V2ssJ
zxvMrFRo71m<<vmFN2pQUe2+bejqk5UKWiuGLBZrL19^i$mp{FSX9N<*?%|sPi9kr~
zs%6`)D^0)3p;s*=hH>LqRt&QViF<1h68D*^xppBTpSq9lsZm6{SKHS0*DfON*CXP7
zV?=C>w(ZsxBVxo=i--qILs{{FO+<{WK}0-gs^(fo#Dg`Ah?RA1U4QK&;vqdE9x_J6
zLbq+Vt{4%cuUbSrY#PdnhixKaObsGptf`u784+V^7!lKP(DDEJ)EKWv#CT&wJd$MF
ztt&>vBUddVCYXk@Vgf&BSx78?jK>Ebd!y^yUcl9uX)>+i0xi?3DUdkz82`l5JsInq
zNcq4-%{1_A9@_Alb<%#xFi9W$Nqk?89%+3VU9%pm4tweE2H!eq^&4FA9Q(U5WV@%@
zcI}EGJLRf{tlu26ew&-v)EeBxrkSd_b~iEQ)U=weeOss7`u=LnHv2$+To2^OjUkbj
zY1^$UhQ!RP780{eV_7lFCM0IpAS9kJRdek^LO%6G4WDZ%O>A9%?IPkSJtCemMnqgQ
z+iqPkBIaDRh?r{{%8I!*5izd@5i#FX&9#h(`8AA)%I3DNzjhI^K#zz8{1ttnkY;&G
zUojB+@gzA;(w<3w?YN||p{>Od&oE@SNT%VdkoXryEuDR-%ZG(L+U7Z(X*@Wqy@)rn
z6uxFYKDLPO(_Nbwe<06x#INLIyOTe<`nvb1_339H@?Ud*ip^<NrOclX_P0FWw!i<i
z_llNiE7R&beC5NmCFUqu!Z!yyza2kg+iWDFLk{iasHOi=car0G;umw9CjR1hRxGu-
z#XVPpTii0!)nCh7+%o>6Wk#vfam#Ys>1Z9u<oM0_rQ61H|8->9oGII{k5;JnKIPa7
zek*rbPNs*f`i}y_df2N}tm3@}JL?|8J0GPAPf+?egzw|qH9Cl2=|L}W2Z)89Z1RBz
zOalwSBJdtK0_y+3SSeVbJe(xV=YHLuY{~BMFO2zrWo!eeRl(R|AcHcn5jcNmtQlAd
zUIrV%W>5)!K8boyF*f})V^4uOVDcH%2fhY-K&!KidBLyX_p{8;+MmOF7hofJ9YmkU
zMS!8;F|ZYE1DC+y3%DRK62ByD2ZzASKNy<@mVxD9HFz0p0Gq*^;0TDk#MqNy3FuM@
zhk+q~`WYLKHz`(g&VB=zBRH!Y$=Q40Q}AL8XInvJEN30-an=cZ5B7oR1kRr9$k}s%
zUcI^a8~!^CzBBxH*pLp$4{KUYkz&;w^LVwTk$m7&JfhY%6k_EM8VYIt+DXH2>?*RJ
z-5jiR0mgAJa35x@GZ+unfgeGGBaGbxHi1ge{zr@n_y#ojiLr;lKfqU@7GBaR1&hIN
zpaWuH4xm^#0{#G(z~En*GB#P5%S(}BL%<ZEN6SW}zXf}M>o>+~gR>wKQA3e*Gw1>C
z2Qz>vvXs&k;T7JEB5V_IAe!_@%RyR?wtpgh8BnyPA4Q#DG}r`=1J5zW#)5Ij<bzvy
zPx+NC{5ko+H{30E_<`rjgZA^L^0SSFdrQZ`Xdzexa*pE#7|;jI1aE?WgZ<$A3C1n}
z5ux1{v;(^Vh59exX@on4{8ptj9T(u=iu4(fgV4Vl7^gxS!oM+?1g<bGt~e|H&}KwS
z%!bSOHB0*_{!C#SA3;)@D?@+;XwGZ_mq9zs8Ja&20(}nMiTTk7Sm)AV!`!K5m_N@}
z%^}(I8K0pX%@*RhpJr6=z^qay)gzc#Z7`|Yf>nSf*_)so&}6Fs?+Bc|3nn@^n*<Iz
zIXeXOi5O>?j60AX;Nol`SX&#D4w$aJDX!g5(t~wS3vglTt^@is{t)R1Ol6wR9#8_h
zf<E8@Fa<0G>%j-09Q+Q1x|}rttw0BGJGc)F2TOpd7dg}mlCA`=f-T@n@FTbc>cw%^
z0<;BpfDvFSkilB;HuxOu0v7>ybLIvazyrE~zTjan8$1g(f$c!+iL#`e_u=yKEj*dR
zzqX&(Wh|8p{teE6$au~gf?SXXx`9&AAKVYdgBf5kSO?w#pMd?~I1q3LOaz(01N6J&
z1f=JK*TF|%FSyK<h2^}zp+EV7{*X?;lg8j~ItUB~W56Qt0$2myNZ|6+rowH?#5`dp
zPehjO0pEe&K<z}%UXf4i=1rA0`NBs$mIS%rZZIZMj_rz~{k_6JxO)sFYr#5zAO6|5
zin~BK#$&%lx)P)%VMvm+5=AHxdj}*7z&aq**EA(mmrx(AfIM(Ln54K{qpp}qNPi4|
z0kN{Xy^t#By~ShX&(`oXd4Fr6xiY1#FrB+&8*p|Lm<eWqG6l9MUxxH1@D(^8QvMK+
zQu=qG_Rm8f-w>e$x`Q5yyA#SM_CR_dSOj(fo{SNYSN+TzDtTRm-8_Z_%|H(@MULqz
zJgiK)5j~2T0>Nsq51dt?IK^YnBAwcZv(8{xBf9?4%9L)fjvWTcH1HnyMb~sE%`cE7
zq##g1pA@akt)%G#$t<uEl<S(Fq$!8w3}}$bSy8H1=5M4af@B~V1t#m7UZj}}$x5&d
zoYpnHNpl*Kv@~2I@TY0D^?}CihhziT2)2Slin}j){SeX#jX7%#hRQJm$SM7(s-X}p
z0pEh!=}PPX;Upp~owEYa6%0z3A%s^3k@+A<=7P;&udW#aP2yfi&Vq9wDg(0*yg}pA
zRL(nu_{g0iJR=PfB9#3@g$y1`>Na2icrrt4;$CXvNk}$;-Qc3G84gX%MM&ypA|yZ?
z**#Kdp+#L^in<XnakqhLAeaj_fQ<^wj&b)!q_+Y`7J>uxQrx2;kL`u@MDQB;C5t?X
zxip$)#xIa0Wpj257@w_a#*k(_Bzr-fCRi~w(KO>o(+QHvU=i4=YaW3nW-BCzK}1u|
zn#k_S=2<g}`u`|hViV}wf)QY;z1>8*&ZW@52M&WH;GBXwk8#&Iq~n_52CBHG2<Nz~
zFVeHYI>j}W^6QZP1XL)l>6EWPIwps+Y}q{%ebNT0mh!I|LPze-hUP9X2}}m_6j;G)
z^N@ZSd;uzRG!M)s4^%>u)10&Rpnr2s^CW5dLoxxp1or8gIpmvtkVLoOtPl*4-A`8y
zYv5)u4<_ybP(2P_0p;K;1!fr5uaN!`IIhEBfv$@C8R}qHqz8hPVB2+CHx^Piwn6d@
zaJA%2Y^iA$lSYK(0q{Ryjjkyp%^FB{fRtQ3NOH9@&yuDaB-6oG@Vl;g4jT9Gkht>j
zOa*s=zKVM}^|&w6Bf&DT3tW~<U*ZkrHZz5(@~$;l$^C1!P%KyG2}9-4n|Opg@E^#=
z9pr&*R2}A^LaY@gfZ|$BBiIJ%p<tfkdY<z0kp2jqP+Tui{sht)`E>tut)+Yqq^E<m
zit9znuSNQOut#ydMEN~P*YV)Kuekn6`8=fifeDK1Rmx95dNJ6bxHeLL1JVb<1;zCm
z<u4$e?8P%facxH4eLd3sKz}d_Y*XBC&=74y`V6Qea^@2?r@lo_^+7TMOaSY3%{$N}
zu7_kN_#7MnNd@8VG4IhmhSWEJAz(#;*2ETSVg)2`f@2`FP}6)s<Ca;-S#NMBxF1Yb
z+#gbRCnLQaDByd&#5OANJtT2OxUGZRKu^WJokqGR(nG)#U^6(ZxIZEJVWfF69=9L?
z+@!d7PzyI9Jq2t6Ulwb9+DR>Z3CVeIO9>u@V1VM@g%U9XkbVR_4|d3qnI6S~*|Qtv
zV|GA)8pQdqn33II+t`&;J09qJgBjp)uvmdD+F6YB3t%Jo#=iWwC?ER`^v>3Jbb!9C
zwJZ3JG<_kN3>E`L*L+WXQy}>koCYzn`+#}!|C_oM(*{+7+rStwR)HBDITq>1!3yv-
zxTv@fQFkvQ-Lx%S1%}A(A1#+l_u9jB4;=#iWbhQ21C}eWJ;sxlBmFVh4!#4C?KrCi
z>bFype-?h^G4+wT9^3}j%dINashg?1@~cqFV@Uc4SZdW)kd~w$f|FM5QD|Kx&1#QP
zkliQM+wl|1E61U6_l9&9*bfeX;|eTr!#|F6*7cl?Q(UKM`i(<+H8`rc&Qks;(${yO
z2cGLZ<$EDL3%sGYE>ivtq<;qWWOt?7B0Z(?0JuaCfO;LVBLKa?9blLOt7E*!Fr=RV
z`T@Z*q{nr_gAyzP8^G7#9LVp?*{#42R)YgT=z@B|F!0ptJsg|3|0yIt1*bvb4Y+53
z4d5$~bR%x<U>4W_b_2&vc+!Bu;BoK*_z6UJ<*X&R2mCKM2QqKQ{SQnBJHP>O3FLRX
z!j^&z27qN?3pfCTTQEN0d9Vu{2btZmPy!103^eP(+0EclPzF8#he5+zarXx^!Rw$L
zxNqak3x)y-d;mhX6zUd-bUy({PtJ<L-Cz><7jTr~NdqQ=7s1DX{f)EhKp!v%%mwqn
zd2j*5-wr2$?qDEz6wCo@0Ui1TcYexq<$NHgM^vWrhs!ZWsN=!EDH55Fd0C0PD%mk6
zL=a=JU<LAt7{_QEk*U}h@s@f>U@BA;T8}C+)#LVB>LG!to|4ddRFSEkjx8+pSOh-#
zSd7WSM(}W^#exKezQBXlzUU%DUwl>{s{&I!AwKqLZa39q@v%>~_}Irne5{L1^;mrD
zlPx~>AucRqu8U0dgt(LhE<JWcd320poF!XTUS#>Q$-lb5P~c!)Q+djo%9~=B%9EhV
zuMk*cHz+c+@_D?e70R0Gu=tefu*5AjZStuuFtpMk(bNiMP1j=bC6%}MazlMndCD5f
zd#t`x1%~VJSYuUWy2#MW70ISnC~K<25~oy$Dl+xO6sNEW#Hpc`xKvXslr@#N_!0{r
z+ye~dr!_W}r>v>G#h0FdFAWx6^V}EV8oC)6T6iea)B<G<e(;9+QWu$8vBal05TAxt
z4rH5Jp{%LA#gAUAA4{8=%2U=<-r`5Ed7k64t@Au6GW7EL7N%AxYiLEZ`qD;Vndf34
zSPd<_+S1elWlb$u{3u%en9<5qp0cL$7C(yS`=*FzVaOcUMTTD1^_p6ttRW`EP+#gI
zQ(q`H-Bq{9z+)KyI#|Zr1)Y_nogKfXB;sE`vwHY-!hxgnz(1Rf!jEI}?}HpmBj`7=
zb@GD2jx}=IA&$d-`kjS-@t|KP=!XM3<fkKcI`F3BW;*PpvsF6Jq{B%%f25N}I#s0e
zLpmv>Q$afMqtiV)xua7$I*6k)H#%dZ(=<9aqZ2YZ3!_snI^V)cmLEr0IH&@27DY!-
zbjU=<Npwa;r$Kb?LkBx_h(iZ9bTmVUFm&8P2P<@FLI)yr_(2CAbjU#m8+3d@M-_A^
zLB|ht&_E{%bZS5+1auZ4w)E3>pEmZig+~Q>>c*V*)wGwU{WI;EX`f7cW7-eX9+>vM
zwAZEmE$wA#*Gl_S+H}(Pk~WgGX{7BTZ3SuDM_WAF%+bb;Hf6NoT0Dq$Re<(Lv>T%B
z4sC5{8$(+Z+K$kUgZ34)d!Ri6?FMM&Ppf@e;nS*~R`Rr7r?ojPrfKa;>&11-<)IEm
zkS{fHMk`zHbIgw5>y(=xbZmC`^$5ZgMhwNUfvgvMh~0yQosaIx`tlB`@VdfkbVb$Z
zidl?5Y=b4$6!eAF`S4H;*HOA4tIn@qAuVF9%AhX1XRyAird)W>U_C|U{I>4)F}Nm-
zXRv^(Mi<UAwAirojGvb8qzrY9diA6W=NZz4^9<?2d4_bFXZ#_-M#^wOL%MLDAze7n
zkj~ySe!6-O)b{QsU3kx6-BV4u@SdT0rM2g`Of_mST+om%yk|Vsc*YafGZ=qQ7}t<z
zyw!NdTa9P1iqWqy<O03MnDN6E!5a-VSmhd<g5f>mt;RFnYCPko`(C)Q_g3Q>3aN1A
z$fx0TCeQdyS5GU5@CCzrMyw`gumGv1PG9)xgjGj%1?83#97}FHi-kiOUdC977cj=-
zMGFy&h}~d177|18cENVMK`;x8i6h`iye-fLFU1VOJ201VtneNd7cWNOnOp}?D?I(y
z<FB>+(b#!JzVN7{tak)z-2h%f%@S&EgIa$APom~WQS(96{2XeHK&@q<7iu1dnqyJx
zC*T9rTqhdOOSR^}>jPgT$v-^iI2qGh#IXogM`)2b<X5LVCe?PZS^<;YNlNN0$0s~y
z_-Mu^;Q6WA#Ljj6RA0AwJDD+Jty+ar@U)}jAiopk39Pah`W*Ps(kpIwG@}<<=*21e
zHwg5hr5ROBANv2F9r#rIEUwk7O4U4RNlqUjPW=uPFGJ0&1Fh@?NNX|W(s9Qw;damL
z*$vq7U62hAR6qUD(xyj0?X%{kN!ud3vClR$HWhE;HOG1^hpj_FCv(Kz1#7dEB=qSR
z$&Sa-UkX_+=T8yl<5(~{qglkth}YO_Y}&N=eATMz|8zwdMA)~J^FQKF`K>dK4o>R6
zQhCN92q^E|eBN;v=LK@#3yx-v*sKZij0=v8lrBvw=&!txzj6S5Q;+Dox$^!6$8~iD
zc8hW}%6Xr|QOM%tKG9BJs=hv<Y2(vMK^Z93T^<na6ip^27Lyx8O^Pih9YRftEGDf(
zO$se01)(Md7L&YC6U1oXO7ttr2{rLrOfo}F;6zg`DWN7bisa}*<_>%(Sxx9ZXf}xp
zH3@oGt)+ITNzl8hi8El5792*pi<=v&Wb(jhr`Kc?bgx>?c^jLce^r~4Ha0;At2Pxj
zHbD=oHuxt*A^i!uShYD|V-xgoe89)wh1k$zSig4FrrgFR=w;Prr;Sa}&8p3I8=Ih?
zRhtiNY=VAPZQil53Hn*J*=%DI^s{R7s*O$1&#KLfHa0;&t2WQu*aZDtFW~3pAvUxU
z)cvg5l-bw>{jAzNV`CHavuZQP#wO@z)n=xRP0-J(%~Ttkpr2Kni8eMtKdUz5Y;1yl
zR&7Sv*aZEo+6=d`(fwS&k^_DoVzHrHhVEzGrk{<C?q}Vmw~dYNXWgc!jg9VS-KLw3
zjqYdNri+b@?q}Vmy^W3TXWgd6#zyzEZsWDF(fzF3w6w7a`ngfS&rL&YN(_EhZPIOQ
zf__$Ql5K2)epYP~Y;1ylR&8Q!Y=VAPZK7;!f__$Q1l6YM94v4gp`@ibkJgH!KLz+W
zRu*zXQ|HJ)ZZ&es?555V-jb9jkv#=YgEQbPI0w!H(qF{)A3&~X=1lQ8u(ojm(p<Ko
z4s_9)o^0wWgL9lK_=3?ni(5EHx;oU^9{7WFvGVv9PCuU^pTSq;DpX&#LY{aXM3M5v
z>zot$33+@=r(d|h<+ClFqi#C>^@r*ova|d_JKT)e4)#8_3^!pJvya`tzC`K<u$SG*
z_Oo(!8@rkHVWr6Dvr>6|uG1H5u1q<Z>l_-9U0mF`$WzqGn=6W4Jh=rPPf2d4PKBLv
XZ|stPgV$4BAa*M9DHBEKOyU0k%2V;v

diff --git a/scp.c b/scp.c
index f99fd856..3ee3fa70 100644
--- a/scp.c
+++ b/scp.c
@@ -557,6 +557,10 @@ int32 sim_brk_lnt = 0;
 int32 sim_brk_ins = 0;
 int32 sim_quiet = 0;
 int32 sim_step = 0;
+char *sim_sub_instr = NULL;
+char *sim_sub_instr_buf = NULL;
+size_t sim_sub_instr_size = 0;
+size_t *sim_sub_instr_off = NULL;
 static double sim_time;
 static uint32 sim_rtime;
 static int32 noqueue_time;
@@ -1371,8 +1375,8 @@ static const char simh_help[] =
       "+Token %%0 expands to the command file name.\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"
-      "+The input sequence \"%%%%\" represents a literal \"%%\", and \"\\\\\" represents a\n"
-      "+literal \"\\\".  All other character combinations are rendered literally.\n\n"
+      "+The input sequence \"%%%%\" represents a literal \"%%\".  All other\n"
+      "+character combinations are rendered literally.\n\n"
       "+Omitted parameters result in null-string substitutions.\n\n"
       "+Tokens preceeded and followed by %% characters are expanded as environment\n"
       "+variables, and if an environment variable isn't found then it can be one of\n"
@@ -3193,8 +3197,8 @@ return stat | SCPE_NOMESSAGE;                           /* suppress message sinc
    Token %n (n being a single digit) expands to the n'th argument
    Tonen %* expands to the whole set of arguments (%1 ... %9)
 
-   The input sequence "\%" represents a literal "%", and "\\" represents a
-   literal "\".  All other character combinations are rendered literally.
+   The input sequence "%%" represents a literal "%".  All other 
+   character combinations are rendered literally.
 
    Omitted parameters result in null-string substitutions.
 
@@ -3231,6 +3235,8 @@ char *ip = instr, *op, *oend, *istart, *tmpbuf;
 const char *ap;
 char rbuf[CBUFSIZE];
 int i;
+size_t instr_off = 0;
+size_t outstr_off = 0;
 time_t now;
 struct tm *tmnow;
 
@@ -3239,14 +3245,23 @@ tmnow = localtime(&now);
 tmpbuf = (char *)malloc(instr_size);
 op = tmpbuf;
 oend = tmpbuf + instr_size - 2;
-while (sim_isspace (*ip))                                   /* skip leading spaces */
+if (instr_size > sim_sub_instr_size) {
+    sim_sub_instr = (char *)realloc (sim_sub_instr, instr_size*sizeof(*sim_sub_instr));
+    sim_sub_instr_off = (size_t *)realloc (sim_sub_instr_off, instr_size*sizeof(*sim_sub_instr_off));
+    sim_sub_instr_size = instr_size;
+    }
+sim_sub_instr_buf = instr;
+strlcpy (sim_sub_instr, instr, instr_size*sizeof(*sim_sub_instr));
+while (sim_isspace (*ip)) {                                 /* skip leading spaces */
+    sim_sub_instr_off[outstr_off++] = ip - instr;
     *op++ = *ip++;
+    }
 istart = ip;
 for (; *ip && (op < oend); ) {
-    if ((ip [0] == '\\') &&                             /* literal escape? */
-        ((ip [1] == '%') || (ip [1] == '\\'))) {        /*   and followed by '%' or '\'? */
-        ip++;                                           /* skip '\' */
-        *op++ = *ip++;                                  /* copy escaped char */
+    if ((ip [0] == '%') && (ip [1] == '%')) {           /* literal % insert? */
+        sim_sub_instr_off[outstr_off++] = ip - instr;
+        ip++;                                           /* skip one */
+        *op++ = *ip++;                                  /* copy insert % */
         }
     else 
         if ((*ip == '%') && 
@@ -3449,8 +3464,10 @@ for (; *ip && (op < oend); ) {
                     }
                 }
             if (ap) {                                   /* non-null arg? */
-                while (*ap && (op < oend))              /* copy the argument */
+                while (*ap && (op < oend)) {            /* copy the argument */
+                    sim_sub_instr_off[outstr_off++] = ip - instr;
                     *op++ = *ap++;
+                    }
                 }
             }
         else
@@ -3458,17 +3475,23 @@ for (; *ip && (op < oend); ) {
                 get_glyph (istart, gbuf, 0);            /* substitute initial token */
                 ap = getenv(gbuf);                      /* if it is an environment variable name */
                 if (!ap) {                              /* nope? */
+                    sim_sub_instr_off[outstr_off++] = ip - instr;
                     *op++ = *ip++;                      /* press on with literal character */
                     continue;
                     }
-                while (*ap && (op < oend))              /* copy the translation */
+                while (*ap && (op < oend)) {            /* copy the translation */
+                    sim_sub_instr_off[outstr_off++] = ip - instr;
                     *op++ = *ap++;
+                    }
                 ip += strlen(gbuf);
                 }
-            else
+            else {
+                sim_sub_instr_off[outstr_off++] = ip - instr;
                 *op++ = *ip++;                          /* literal character */
+                }
     }
 *op = 0;                                                /* term buffer */
+sim_sub_instr_off[outstr_off] = 0;
 strcpy (instr, tmpbuf);
 free (tmpbuf);
 return;
@@ -5582,12 +5605,15 @@ if (uptr == NULL)
 max = uptr->capac - 1;
 abuf[sizeof(abuf)-1] = '\0';
 strncpy (abuf, cptr, sizeof(abuf)-1);
-cptr = abuf;
 if ((aptr = strchr (abuf, ';'))) {                      /* ;action? */
+    cptr += aptr - abuf + 1;
     if (flg != SSH_ST)                                  /* only on SET */
-        return sim_messagef (SCPE_ARG, "Invalid argument: %s\n", aptr);
+        return sim_messagef (SCPE_ARG, "Invalid argument: %s\n", cptr);
     *aptr++ = 0;                                        /* separate strings */
+    if ((cptr > sim_sub_instr_buf) && ((size_t)(cptr - sim_sub_instr_buf) < sim_sub_instr_size))
+        aptr = &sim_sub_instr[sim_sub_instr_off[cptr - sim_sub_instr_buf]]; /* get un-substituted string */
     }
+cptr = abuf;
 if (*cptr == 0) {                                       /* no argument? */
     lo = (t_addr) get_rval (sim_PC, 0);                 /* use PC */
     return ssh_break_one (st, flg, lo, 0, aptr);
@@ -10608,7 +10634,11 @@ if (ep->act) {                                          /* replace old action? *
 if (act)
     while (sim_isspace(*act)) ++act;                    /* skip leading spaces in action string */
 if ((act != NULL) && (*act != 0)) {                     /* new action? */
-    char *newp = (char *) calloc (strlen (act)+1, sizeof (*act)); /* alloc buf */
+    char *newp;
+
+    if ((act > sim_sub_instr_buf) && ((size_t)(act - sim_sub_instr_buf) < sim_sub_instr_size))
+        act = &sim_sub_instr[sim_sub_instr_off[act - sim_sub_instr_buf]]; /* get un-substituted string */
+    newp = (char *) calloc (strlen (act)+1, sizeof (*act)); /* alloc buf */
     if (newp == NULL)                                   /* mem err? */
         return SCPE_MEM;
     strcpy (newp, act);                                 /* copy action */