From 0293d7f4afed521c68df617977e18837c5e33dc2 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 29 Nov 2017 16:49:20 -0800 Subject: [PATCH] SCP: Enrich EXPECT and SEND help and document information --- doc/simh_doc.doc | Bin 275456 -> 278016 bytes scp.c | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/simh_doc.doc b/doc/simh_doc.doc index 324442a2f0ff71a3d6e88bdf3e68ac496e78679e..62eafc22c354c59cc6d38a81b5e531427325d9cb 100644 GIT binary patch delta 28054 zcmc(o33wF6*08H*h9!}NBoLO6gbDj1F?(iMWK%>$5JV6~1R+9@eO0_T;D&wzq9e5I zi+~Cun=q)L2#6aXAc}hR8h21cc2Gh7_e^(ZmQ0ZA_sf?&?@ZUJQ`M(WovN;`uE4~D zaTCwQP0z@vW>dyboKiJ7)=2$%;lc$GRw7*)5}^uI1z%>mW1;r6EjfEoFHOa&y9V7g z=(ZlW^)M<4{)}=|QRzu`RprTSBKQJPYl z$}2Uuks&Ybdt76sW|mbdCQGUBu=iNDQYR_0a-LFDqgL@PKNtC~Rjg2lqfHBy+Ca&X z&nfi)>5r%&(c8sVDSE$Y;`ccutJIP+%a8T_eU6c~zCW7hJ!en#ScV&!#s&SG#6jwn z5?Tu*C;VHgd5sIQ&T7>Yo|X#@{;}#YW%}+lTEle9rqYz9P^?3#HM20xrl+m7b?~^& zimek92mV0V)2HXsQH38#Z1{gH`GP#9+R+lT<|=iQmC5%k>Z#0kGA-MjZ)suqIb`Y` z#nJNfJ(5!*c9*7aT|jC1-+OD6Taaa0U8+`CxQLba+pdl;p}($K`7gDyS?(sC zhK*g98eLSToI5`|&z0-)mWfL%K5i1{G>_fhZgH;S<6?PUhWE9&=7yZ(^Ks4!{(AB< zYdN*bncidZmAuX4tC2SJkX;=H`1lR<>$$c~@7;G3Blxx!api zIop)G1M>U~@2JX+3^~UY6U}<^Grb>FZehwZMPAW=_WUgW+0%2QyhVk{-rEx6ExEJT zKyg@xcX}n$uKaB8>_qd5Io_LSHcNhv_qRmTMvepWTyL)`rbqL0gXDSMx2s%b+LGt} zuxeVoVT<93bXR(2l=tZ5THel8<4vu6(K3%+-Y2WNi;n|xxA#oddZyeR(065cJ61FO z&hg%AW<9P<@AK7a8&~VfG_N){aJ8;1?{C%8jrurFuWpsg_I3|C4#;!7%ZlYW-Y1hR z{ao+q>ZaFRxk2(g?=4AY3%c?|9_ROh%k)BKR+P8P3a7UyDL&TBFpcyctCVEgzndS@6;627PlE4nR!v( zBYUcPM>)*~ac7BAg5NH8wh=;^dD3p4k5jx!DVAEc_gIQ`jvVi8DP}vkb3|?y&n+%a zC+PcWb?;}z#dCv-=XtBAn%&Ty7bMU3PDnM~=*|z4yS!heHZhvl?J_)<71X?Lx3^i% z#^xmxE;S7^-5D9)88wai2i}H?Lj0j9=M% zQ?1&DDVdqxX|?N`(wB>+S>A7I8{y;5%<{(9HI2&5_PXkrKI1qb&+$&JW9j4s$#cD5 z)@fq+FEiI@vuy8(WFy+$nR#A!-L{6GGV{#r?BX8l&dm3&s9V=GG=JTJxG*R^?iyr%W=rp--W_qq2Lnh^2&?Kiq`Y~kqpioMmg zbHp=MwOVLcaT8rrKr?s;KbN(x+2ZN1JD9px(_?yTof}q-RqFWn$3NY@ZTIHgD;KSt zHgVjcQ7iKXKsegAbd2*s?%N)+hGUqQWm|=K!rj{gOu2ww0e`A2h)*B*fow zVg62;*zq9rCA;YsLk`1;TOS}lJiBNk{i{09-+w!}462=`uP{pEu2tE?S# z(T5AP13^iDqZZwLNevTRjgCAJ=>O~Kls{VU(|LT{`$jDQMhpfhbNc-}VZfUpH zxNH_14twd5Am2J<_8XY-{Q5|6$aYMLXxd+f?4$o!$W9Io*~t+GvBxf95PLkNn#(tc z`A$53sdL|^&WOJMCwg1tK%Qy^^3>pvNatNqgu(SMLt@%L77|Z}wB_L^BZS2CO9+Xl zLaMoZA)%jm>Jsm3$#o;T{_;hH*NO;la74t_k7(9kM#MA!SVYVSY0AShB1FW@ONa

zo|NpUe%k!bZ@_exI%kv`| zU!la3u3rAdzhzER!fG~@{EdM$w4?hDzo;Fsg$0CO^wK4acPm3K|MHD@z7s38fm+mG zul7ftxvnyLgzwi?T5f*qHPe+E0k=P+RIg|BydSk2(su0G!JB~MpM)v{c?F`{cBrg6 zcPOK}bSR_G|559!b=+`Jt5zYir&+^Dz7w8eBN!ZlQC_Q7rFK#KZfH4!4OIG~lUlaE z@T3-_pZ|}Rq^~^5+Y*vF@{y$9u~BOiAEi`&9p$Q{+SgG7`pX-bdroQ3c;b6e$y}HZ z3t~v0&b`2PxEI;I1T`TS@?jXf z40|AUxl+U7U+^eQfz7Z5YOPS}1z6dUk2UZPoH+D_^?PC;zlTnc=3w`Z-8;7I*!|k- zeXB*hZ})0`Ut3o4SKpg#tEzAMLvwnfs|;+{KHL9BNmVpnx)~B)U6nPCRLLm7Gl~Al zFy5;L#RvY5AS>1mizb!YTHM|q9)l-f3iO(()E%%%e`~*1U7vea>#Aq0wcV{BIjyDZ zqgQCv^w-X4*XW}UY4!B^ziH+5dqtLUOlzH0RtolkzL2QPyGGg&et;k0O4_pt#LedY zBKS{IPfn7fZ`sesp0ir2zGb2oZ=7z~Z(2`%%x_wzo_t2TwVAp?3RQ+gD1xuyG@OC^ z=g^L@8O}mBJK09TTJWDJ+c;6m5?hQO>0`io`iB29mz^&@FBWu;kt%+HhU`fj2+zZh z;AGQWXP5v>;3L=%hu|lWupMrOuFm%YShzsXY-nq%$EDd~W~{`NJIaS2oIj^YR+4^0 zWAckX(h2IoPe=lBRHVL}tm~&OQm%h%IL^ANjvBh8rX7-a3PtbZ=R?n=zWe7{N*)UAAR^Ct&u)Wvkkeq!YYdY z3JsSj)eja!5hOj2@4yRtA&zmWJ&c2;uoM0O8L!TRj9JxS=!-_6v}%X}d?fj!W##|) zV$ zd=I3KE-(tV!VfEz`WdvBm5PQ&a1~61hhZaZS*z4ruyq|nFzkV*uh498FHD8q@Cj63 zuT&~zLOwKu*6Wo=wdbHCbb$i+1TH}C1_BvUd`jI6!{AwX2hKp{jY?%e54a0%d6hDF%i7ni{VAWeV70yBKR;9Xb>&^b!ZA1kOgwe1PF1$k|ysMN4-iIQ1 z=mV}CKHbSsxr->-L#ym%k1h;_;c!2!1s}W$`tZ-_1D?+a&$r`jvL#%9CEj+!J>A9C zU121M%a?$-eH(1Y?Qes}boU0+-6#02x(dT!B20x%@HJFeO?be4@G=xZr8VfT(K8Qd z^Yyq)qOeJne>_VH984&rAEnf_b<&IK+M@JzNeQ53(wBStmc)h--ye(OV($@a2qJLH1Hc($!4s-aZm_odlHx)(J=>unJ%Yc#I08;OKv%dK zUIOV52jL8yg-JVe6ReJQJss=;kPi1ANT*x!9>XwL9q)j2K4`L2sdSKz_}NZft4MrtwK4wd_Hool z>+qTA&`Ga?X3!jRcQciQ$*>Y$hMgbMu;AQ7!@~8@0i*h zMaO-F4Xh_)6YPVJU_Y$?gmDG7L(HeR6>5SLZU-IKz*;y9zeB=j^aDu!9G4$G{nK|p z{rlbZi`UQfPF}zGy9e&+b$zdUtl07Pv{lk8r`Z0*LQ3ltX2R#KWa5QR~2)D z&Dda?@wRD7ET^(e>B;eJFc5~qFc=3XWa^xA@^}S0bYTPU>Rf?vle4Ef*2EQ$Vt+t!7@aQxDh(RG#LFAkpdH8 zGH74Zm|t^CY{$V^Ncc{vEO-uHge$*ibcC`$^2Zpk@E{!oemTU|{ltA2M#0u&$d7aT zJi!eH-aSd@JHWu^ZE<7-cFQbe;wzh4M zUi6t(Q}2;tt6w&?%D@W4f6;fR*s6P)i{I-&@TEUV`aGBXr+L{n9^%)-g^F^7Q=`YFMaGH}3nY|U~ z(*E^H?kUT?ijN$$3gB2eY%@`SJ#>rg1x4|j6>Swwtyb8ZU+F@=0a6Vv(+*~U9rq#2J)P_pdWY`X; zq4h6HJq2Gt@(~;X>%smj&tWhL*1`91)ln`M-h)&^br49%CJ?ecK|*&KY=X^D>qO{u z+dt>_f7I7UH?&RZT8kL34K2Zn`B5Ctg4yssd;mWB!8;)RA)45ag+_2Kg!T{JQxC5X zZDe~|>ma>lG;9Z}*Bs*5>N&&cJ#WC9@HIrAVNL;~VGSIIoU`11&dROiCb^Z&HRd9% zuC+BWr{YbRic2>f1>-;}d+`tM!{-PN+Mpxc2rd5P56!iVF;iAb)aZQ<@qD zV__HUfx4Qen!>{{88$;Lo2G7oCU#9dZr42OIS#IKXsSK*hC87j426*}4#vYWcn5AM zqp91VOgT+ef!b_8&Vzo@ntBP|h~?zqsi>(ba8DHsfOo)_tSLLpgZZ#4Ih_hSXzC7- zzmDW~#qS~ir*Z86JY*gp())62(g)?(Cdb4WOEP)oC*9P+u7CBT=Iq`k7mwcp-Qf`Y z1l8$Q*THyL01M&O-&rJslW-pX1TT&k=P!pYG=Mb1!(gseSks;QGUuu9JDP5b(>#*D z0S-Yj4HevIUy&|?<}}p*wgESpjrR-RRB8R_yEgEkLElW$&+lZphWY+n`A8C3j7}uS z=tp<*7*dpJbKWC`rS)q=H!}(*@%;w;2@(Opo*Z8$?yb z18^m@gj--RJOne~W!MIv!BNnvX{s_bfQE1zgqf13W6GD(Dm;C;xzUJDUl;+C;2C%x zHp71S8O}qM>Y8c{t>IQEgnz+wcnV&Jt*{Tif#XmnNmDf-3$BOTVKh7rrd_^SMcS>J z871Fp(H?n9N)d$xumRqI&*2FC3Rl$7R05I#EkTM3o+s3dM9>j?Y`%1PYAMtMt6PftI>^kvvddz3uLPV;@$!Iq}QO8#T8 z96ofKws*w#gb$IFPov{Pd+3=axyiotPPTnoY)>SkVJ5ul&*7SHl5(#i`3Qc7m|Fa) zdMzo}(ATUhzDkTm;)L$-6l{g_VqbM%dN-+91P39uHoc{`X;616j%|sgAIt}zm2<1) z_>lYu9Cb8RuZ~&fHp!`nqz!mrxs}sPa+V|c7|PV8ch)t_^p>3JNZLbRm|^Agk(?Pw zHo#|a#>%-%a?T)e*3;Bg(4wAMTYt%Efut`?hV@p?-IB8&$yX3tUsJ8>n`H))6W!tNC~pJWcgqtya%7lapWKyEkP#v=b&aI?$eD- zOUH_(Hy{}aUU=QgxmR*tN3tJ&hI3ZVcybcXA#pawNEivD8cU4?*uNyeMj?3^w!=Y4 zyfP4A4@iKCpc#yT*Ofrecy){4LhePOa5|8lXli>2k3NNi6g>sfdoPL@zvCXIWNtSfUhbqx&674wGs z9(X}=1|pdXU&0l6X3lcSxgt+fZQ)^f*~)o|oP?K=ybnhqDWAs5mvUUv%Un`y4J1vV zH$0W^i(PFyu0=mZ;w?Cr?~7h5t#*z?T^Ehx@Pob+D=sB2b1+AOov5qK#$)qH`6`EH`DhiRiUS?prYdd`DI%$ONBly%oFXA@auzQ zJgkOqt(<-2Bz}ve>eZU6292NvlrpOAXH<)k{5#=Zn5V}Vg$@_{CFnkp7??-?UN{4B zEj1P2(u{#mC9LC-)P@c)4wiy-L;ReuP87jb*aja%`BtTx^@W%v`7L2IJfp||5Ng&J zV%C2!EB+bsUxf;-xlcn)J^rXI#g|?reW@mbd?U z<$^@;Bg9-wlU{2E-ASpqHj)<55pIM#{kb^eH06@+MDiFs4s+lgco#ms)|YhF_JbDl zDGAjMyI_TWRjhrYzGsbA%eU%xTNf=xr1{V*JolXBiu4g!7oPj46xq9?A(Gx@Ezo~_eDGGj0m~ynWDie1Z73AiiEnJyYThC=<*^+ zB+(x3Ll7;3`$)V9`w>(?P-#C2tpi1%3e@Xh-IHQDXD5=X16a@dy*bXkfg3h-hmoMe zMmPo)J2Jb1ey|9(fp#O+LdP3@o#O1QCwC+<1=ho9Na;jHFcS_yRA;P)k>G{xa0qJM zL`c8@cma07FHon8rtXG~@GZo4Wjuzdun0E8F}UdClPJ`@nY#n<-bpQjZBVrv{Suyn zHSjH@-9it5X>bstyKBk~J>el(3ZFxh9!%(AEX;s?a02Sy%F{eN1SKDzjK?|2djYn? zSxD~5!~rJ4c1XI7i51)fkHK4T7^>e+&_gHa46nj#@DUt?m|mK4f*WpxLXcIQz%#FJ zZjpAUX2kp-RqZ2fF>aNwvQ?gPsa)mKkJYdbk081tNK21zWgl5W5L75nWrWvbiGqsd z>8)KM^%#Pv;xp;PYuHDJB}2-O$OtPhf}jFlr-YQ3WJvi%4Z_NcAmlpoN?wN{3OdV& z&XBW6GNg_YKE>7kYC~)Z^C@#?oE&tPR<%RUBFUig`Qg4a1VQE3)D0;w$&m74zRcG} z5Of{+Dkt0*mMG{f3mSx+MUo+Pl<;RhPX`imA-3#whO|q*E`p%5#5E2%izGwJhxsx; z+?SJ@gp`+LP}0*Qa;R&F25gxuESljpIf3JD_gok&LYX6v$*}PySN}MHr@W% z3_8Q=rXgpLWJrZ!esqWXF|9>Nc}a$p5A&nj@5c~7l<4DbvyTT^S+P~fStMCp2W|`Z zWk6JHi#RuA%(Mi>XL0Kj+XS7(NQRUT@uid(K~VW)*MyXpWJviCUrKoqgj`2hA4ey= zk4v!-pIU;Ddcu4v^@NR^QY<7!EkV%r@G2s34{_^~47#4oaDN(tpz?2Z3@IS;w@^7(KJO;J)wLvhTi+Mm?B{AE z@^4tGRCe9j$?*Rph~?P@q5m@6KBum1W0sw0vIjz5zssvInLeySbq%bAb^4kS_Lkaq zJwDCRvhF8H4gfD=74IJvulE$MYm|ezYAnPN zK-q#Pd$DBC)5q(Tl1)Lfho|aWvd2aCm&hIvV?%~)Sdf?5@{{KFjAG|9ZA8K+77ltR~AUu`C12IoN5~R{tUAa-gRCXUs(~yE$m6~|*vlil zJeJENw>((Ov$H%8%d@UL(#kWdJe10#r#xiJ1Ef40%7dRg-pLbOZ63DdiA)~4u9s&k zd4iJXBzYW?Cmwmok>?tDl#!&J5_yP_IlIi0B>-0wQm??<@Uh-A&5^B7Pje*e ztJ56S^yy=GgLzJ0ImTX7kE`XVQ>G$U6{okZ<*4E7Q_Hba)28@79%p~2OzhU_ykUfD zPZ8JMe9I@;KeKzR&f=f{su*>r>ZXRNe*7z^ZhixEV|S@}Ol~idmwA!AEEVG^<%D@m z%1bjQ593PD%e_cmUWq)9b%l9cYw4A`E|OQeXYw!NnS2H(&gY5f?tF!7O7V;sTzX#V zp2_C{r(`*g@$ADyG(x78SGs5Nd2T9Msa39Y&$uklcp?Ow%WzFZ&$uq)8P`QT!wfT` zp&ohilh`lqDqI)wjO!vXBej-ZXR&8ICAym2=}RjpceK*;N{<$tx{pB(JpI zBzYm8@o>G?Fe{lst_kssr{z>On=)5w%3NvQ9JUnBV_VEZ_Ifd2YRWvx$qn(~>+Ip;hFIr4=0&@h z6YXI?67<|>>~P)p74swJMm^aJ)|WkCc}KbVv5(8kT&XQ{rMhgpd7Qagd*(~a;06|n z%CK*#HoGR&8)bQ4R*nTICUNsCb3^71KbU{~{ErmJG5yfv_FkUrF!3NJw#3B6m^ca( zt1RMAe=xB(CSHY!r!lc9CN{&weVCYvd8=V0Ccg9$^HNOQfr%qAaR?@M!^Cr#_yQ*0 zfQfEQT#Si#VBQYsiHV7rn5(oJ>O)L?0uvv?#GRPf%P^4{g8uFQ*dO$$#!8igjqp0e zUCAa~7?IAtZqTmcZ-QVWya`WduvZ@Tz{hX^euO`>*gu!e-Y@6^8(}lJa=3UH2*W_j zRjNExWyYPFuj;6t9Q1+eZZ>eh2{;4$n_);d!=Dd4Vb9m6K4EWA{82vEuF7!{Y*KgN zVTbR{C+y5#uO7q>K9~d#!z_3n4#4Ly{vQ6g3zoq1un!Kv(jlbbeb@~j!RK%q&O+s( zG#j*lmT)hOhdD40w!@C0?1nwd!S7Ie7@-5#!gcTfJP0%4S+I@3UC?D5?FohV(Y8=& zJg$K`Fb_sdU~e8Ydx(=m^+#|UxS$y%K8ilnnauvq$sYXi81V^Rp$80tVK5f%hbA-F zY6(t)vKCB$iQt$;J3~G+hfZ)a^dx9|!>@Dc7qFH9_Q44_3r*&;eG>-2U=JV5UF-2VDl@cM(i5d=Je6 zYA;<7+|Ux9_?X?X(ESs<26sRo*aUCFEk7fNmA}v&@Cv*N@BI?bmRk;5ohCqTHoDG{ zDfY?w`6>2$LqF>1W2V~U$`<-NnD2?H_BMSI6EMXA<>7mfpLqS7U+neM<&QoO7R*u& z94{*QSC!h>e^6-?4k`IFW;Rc&bK{Tt)#a&qa5ug25xcvL93S-+9mD|iUgZxwbE%c1Nn!}fO!v4NZv>w}V+J38Mb7ktcow3(-Zu;93WBw_{-f{x{8OXuAPI+mX;ovjgc0)DRQ_w%L_I^t=gz4DZyvmt^` zz|V%x>IgakKN~vBBj^PDZ0IbBpcC-3p))^%PQcHG&a)A80)94ho{pds@Ux*aC4x@C z&xX#U5p)86uIBgi#1cCBL4G!L#z)Wz_}S1I9YH7HXG3Rb1f77N4V{4zbOL@hbnc3v z6Y#U4(<_2bz|V$G_Xs)xKN~tXMbHWO+0f|_K_}qn>V7|8Q$i;%$j^q()e&?8el~Pm z5p)86HgvKg=mh+1=v)~=C*Ws8r(Oh|fS(N=X9S&qpADU)2s!~j8#FebT!kqb6H$==B}{kKaSX1ooYV?a;#*zE zk)yeOC;11QgY%Ll$p0qAbVUQ3Ok2PKWuPqhD@?BEs1_efsv^WeJS6Cu^&B-4t8`+R1bDb*i=c z6j>JEUGx==9q!oB%6!KgJNlQY|)*mljtZ?7in)=FH^Z@6Uhc^F3#;XFY4}XFcm#Yp=cb zHin-}7``WALUwjFU0FW~N~LnFkve_m%o!2JldcL0kO)cO&+)ovYA@*NdHFYMDqh{z z@3ww_ZuxVIRY~Y)Wp}E|N_DB1miD++$nUC|Z;sSz8~yc{ik^s3YELaoy?BaJeW-eK zU8R;+QfgvTOJ3IZz-CHKuAo#*u2MU(cW<6je^8`=dZsu4#zXLag{OiM#Uf1G-3nYnI>)+EcZsVrqF6z^8*@`?0>Zno{JcP#qC zw5o7UOdJFPVbS$DbE|gyMq(rIW47Lq z=~ns?Y)I!&(leEEsV_`1q*FUb!BPu)L=5~lLZ@-gx8ngPy*1zbXo=RSUNCLd!_u0X=<^C-Cia@*}^U21LqB(neav8M%(tB~toRe#%ZuYuhB2%3pGErL9_poWkbU z-7#oMMr?6RMUOW(-&2@l#3a-$Ic}biX&>hr|4#6h90%oj#(JQNpvbKFh(Y}wB-dM@&t&odrKZfeW(jH)S4J^9AkfrUD84)0xH%=!k!Rl8R~(jY zOsMAARcO4FVz<~+Xnd7ocZ-Nb+` zUdt0%-mIL;#-Y*mjBBeWT3X(0(Xx+ojPccdCC5Q|u5qk-BU_#uqMv76UBmXfH_s@l z;nb6Fyk4Wet)CwvFEEbR$g<@HMpjKnztFfL0 z%kDX^&lq3JuHTn!_-onT;y5VJF*4KI#0Na&%dvaK_^nzk%S2zUF*dD9$?^MXPIY<4 zuCxoS&h+J3#d1SB)0c0wN^flE=iB)?!Or#-7%!yf*!30|{nDL!3ys6+w)=gBA##s# zb8XwrK2M0;YrI|C9zH&=@mp=D9-mP&!;$++e=fjoyito4nb1#-utbAVRV7KD1c@1p?bF-IhYB-?(lKWm5qUmur8aXegFR3u` zdVR?yX17?Qnz7Ls^~&o@TE4paJ+pIHy|4<)sv1xW(#)7%+O?^Nck#P<-6!kbU$-dYPS^|jkH-JKfGIxPlu^2AkyVFQ zBjwIXFMNKtR;8r$^r`tuhN zk2n$WNN7Y%OpI#Q-$umHa~2W9!n$(*uqYAn=vhR>V`0^t&xm;JEF)qhn;idNuNp;8 zL==Ta#6zi3&HCGj7=F$oVnkS1?jNBYi&#iZ9;GD(FMETkM{U5l7-?pyRfGBaC~ZxI zd8VxJ%;G2P1xDc7+^6PwGcx*;;Yp|SpVYRV)g`T4+Ih3sa@hRQAuF=rTG(3Xj1CRi zt7}I!?QcW&>2nsc&xD8UGf^h7XU}31doHY+^EZk4e}C?5*S;+?qx$|_jJD{3Jl+Z9 z@u4A+#U_1}$@OnTV!}BKiRZ)ma{u#DLgIz92ni#sn)4SD=I_Q?Uf0qaMs@x9i-<{1 zL`({eh=j&b&HCGjn0(G6!VK%m{brPim~s{o@nTpt=QAQ+Jj;kU-6X2(&tF7Lbs}PF zXha<5f!sftBc`3Rh|(wkYr##azpk%vX%|BR5M|=y;S+YhD8C~jcNj}; zUhaQgTk05@lC+d3)lnvj|FyM+bN=60yJAjwu*?ZHelCy6qZnVM)RwMUY2H6Fr&iLU z!lUhQ<1FU8g<;JFA&RoAAVIc9Bxg!I(Fx2wnpBVhn|La3f5CneY?rfxkdof{Wk+NP^TNKGL8C z%!L2K8HjyLsh^?t+q4jFgXiHR_z_M(-K9!h1a6 z_j^%!nUQ&B@ef?3dL7p?iz=k{?Qmrt?}NGe5db_8lN8UhVyz>2Z1!)7f!**k-1CxB z{b2#@f%?2-bvwKQTcPGOrMiI$n;?NmxC92kMEC?&!g4tqYO6PD&CR}UJ?6s(@J1|4-%Zc;3*gl-DfD(1HOiDz%|nf z-dMhuo4@7jd1q~3?fYrWcDLTle8Q#oH3y~XG3JBS^@iqfm+m$vS9GPD+23kyJ#kXE z436rM4+S6tWdO)vSpaKbtvztsFnBJRZE7Ap-ArhrH=eYO6V>+UwE`(Ka9)Og;N+vN zsl+;EjDGix8qSWpgc=@!cj0$v{wkdbb73dc`466esqj4{F*Mu4K$r}lf(+l)AVYY^ zYbDlcFtxr^S-?s^Mk{#pZ7n7iU&cgQ@J!JOp$cf)_+CpZKxn1KevFnAPJ!D@(kpI(G9 zFcyAS-70Tjb_IK{xSf6RmHw0>qn3eKHbLxyFFekfp**dgb4%0BWT5e=*0 z45WXgR6S@8xzGk4hW~y_->;(YVIs_hYyQjC3tm~H)G=tgj!Pm`_>xY6mT);d3M0N$ zcdAhwq^`#yQ1lHU3)A3bm<~l7P=s-?>01H|_QHunVZS?1>^$+q&L8*)iogBx+f_?u zj-5IBao#VfZZ@i;FEf{3p#ST}=HeM?uoZwo}X<_!Evp z%vyQ`&OqnSnWx}k7y^^OAe>iAJf_6pJ|QF zs%iRfZ4RO-eO?jTgVX1aajd>#g#taGC(QktSqiqp4k-G@-zHuESnDM55E=)=?Kl{3 z$HHbi7WVO7f1^?jAQ!yggSK!J^oC&@{hcyp6iV<&frcd+L?g!^!%El!TVc;8qJA?K zLuKKpR~%g??%f9U+d{mS`O=8r#UbQ;V7mqg_s0KM858)5c3^&%BVfeHYTcA++lcyM4*DC$x>rNaxZl zyN&7&j-{EK;RGFS{g_kg=}paX^%xqpQ}o7W<^rN6p+2*a=pBSmx7>tlR^yJ(Y?pj) zyX6%!g1cb^yae;$1NaV3sgfUaOjB93G}GfIb>~93 zU<@O8zN{CnlHPL6*|J@!lQ3Whmwh-2Gk@Z4Wv5aL zcPZ6xH$xcwKjR)~vWM`3F~1@|#ESekF8lDpVWx-Q2|=h2tzkSYhGu^dOyD&&A|(;pe?kALGV1JxHQ!OjvjJ;w|~9;5Wk-sTF#dv zl<&sN!;*-W+u7k6W_ClppIN+Dt5eibdhrMx1;_2DaQzY6?bUF5Dl~;W=mUe`Ntg=K zEwkWhy5<>J2hvRk;1Ia!t~h7|{b2;)Wcz2*R6RkKwsHQc7wUItMUrd6Gg#FV`W@({r;}|(L4Z^iEJmrTXTFn^nr;m2}Th0&x1t& z2G|ULKvkkXd^DIvj9LG^S^5iFM;RM!U>rDOWC_R4IPoz&o(35v^I!w~1#OOSU4Z3q z8qOS%OIv5Tv`s77rD$%i&2#iSuRnuQoukY%ums+MpCIuVS2?&F`oX9_m3jg`fYtCB zbSHFVj1Go0#;J_eP7v6>$SYYfG?ryUWB;LiJwdxh@`u9`*bSj$dk*7!E>vJVpZz#b za>n^n_89k{kv12aL=J2I&FrBhc=T!VLDw~9`oqQCIIWX?8;_oOkKdjb4)C49ydd+# zRq!-?1~OOt3C?`6gE`};DD%d^ka^;Tkh!8E^Tn5LO%=N}^S8~~DE~pPo}_h?X~Y(* z12G!SX6oVf;D_MpDw=u;{uQUG8=xRrQ=Q;>_`Ig3zJR-GX{s-nkaDG_8iV{(GBYPn zPcb{?=}*Y&f4qFKyCu_03KppC;G9n5l&dOgYBgNMY320op(ltL55pCeHFYJ##A>Pn z^uK^v6C4w#hM0LHrtYn(seO=_h&d3vD4CzXqb2yqwPZXONlyPHYJ!Q?(4=8bBd_In zg5B8Ve18Jpz)x@#DyPUh)S4=UYoI3#fw3?fmcd&15e~!e&>%I`5>|unNPx7|w@Msz zGK*Vt%@dtwa4}p3J>WhV4b$OmSPjK+1TLtqsd|tH9pGlT1)hX4Fb(Fza`+NF!>jNPybIsL7T5!SfFd-i zLS4v*E8u$Q2g6`2%!CE79Gq~{38PwYDRhQA;gs@E+@W<3*b~^~jLi<%BY95fP2u<# z*f08!nWm{6$c4+&G;?@M{aXLfcKTCV3Q5%m?tq725-c=-E7ltMFK(}Ys>O@o9oP-0 z(#-h#DcZe*K3hvUg(NSX7Qy9kJG@h}ts7@%9b$oVO;`N|wjN^q+pg5>YVo4;49tPz zbi1~W)D~ZiB)vAZ!Pwe%&eh~3jz#hgybEiff|+=wzR~R7S+8p*{L23Ej*cw&s&v=y zsOqkep{cGg7+%bq9hp$>gvM0CAdMQ;T8{{!pbP;|W>qIZb=D)pGHV6d5Z10D)F zWiL?~Ox6te5`HSBavLh~KarJGpCJf6>)Y<^Bi+>#$#9qrA2~U9O3p_}_Q7$e*uXB+ zS8^&gpeE=7MNUpX$tglI2R1`&L%U3Wa#CU&vgm`>&1exf}fKTDqKy8Ek zj}Mae{EDPOBSIA>HS!Yxhly|!AHp~AOCvcs>Vrl77bGvzPvUnPGP?1dCF?tc9~|KmfcBrfGb+6LX> zNju|F$#@dMba)$9*%^qq?E`pe* znz{rAH5IgK6|mRIc}1MC7fC{nrdmQz=#?Yo=&T}Gx61uSa?lhVZNy3l651z4&Rnic|+>| zmaMpZ;sA!^+h<-xPSOx06JZ(bgk9tYnzWcE#qUCL3@$8SMlJBizr_%Zy@kYcu&Tfx zyHvVz6^UP=W}!d!9TC(l# zf<7cB!@CGR7QwqDeg@s^k6kGO-OEKBS|L~^f>tE@!xIQT6TuTC{sU_etU-{nhQ!aX z2aZD*U+@C^xinY=!(lS4^x09dPNHHZk|UtEWMS3P&RI`RN+FV);AXf7W>!fw3?HzJ_ud zTP%$goyu*vrbCZ5wlO=zm>x(*!A95wdjq-5Dm!J!??s|rqNx^eqnWs+B=!TNeK!@v z-AGmuOoip8RQAX@mXoy|s$Rm5cfaSHh#!uN0rP6u@TS$~MbPa{ZZ zN0dNscoLi*IVxTf!JDuN4w#Ai!mT+f)5M=L(hrbd@iI-NLUm|zneB%Y)KaSnlCE$a z+yT$S3-HQi{#qyX-CEo$B-X(9Fwbm}&)!lba&aq{~^I!#ywz0w<{H&#K_!(j$U5;LPRz*h(%2{TUL? zJ80^W4*u9!5j;X-4QxYDMFiVOBwfMk`wD+-ya+BM@c>Lmkbt1tbP{V}8x+H#E1YXl z66fqhQYBv*ysNyB<1?WCrKwD41-)S;ya(SwY)8z3dtfZAg+q{fmA_N6i%sg(tGJbg zB3J=GL#wN~$iOW429mBp2HjyCEP?%y(1|F9`@sZ19E9v^F#;CAW{B&|NP>G{G`t7) z-If2v9a^`L8yV}yN)-0Og%hPB=3G02Oq<3sBojEI>I>E2{GNcRfewc94v*O zp!!X$)u1Mff+yf*cn>zgK5*TP9^`@S6$Ee2{nK`6JvA%l|4MV+uUGacugc}mta!}r zbzOrak{6WZszP(tMXvix3F1ODRG#@;9oL{JqL6C8Y!G%9Nrn|DC|!po3OjXT`v_Y^ z5OS7F8;6}ml40fBwu&e(f{^lWHVG>)$&m6M^S=DB@|GZ^9Uhev*$zh(a+Vnvg`Gu` zVRe-9r^j}2m@Qv5h_FQjA!kWw5q1_yhLw--rN@l$<%pcH@{$ZIAK^=nSxWG0od^p> z5MtrL{ID}fGQ@1QDD<9!UuNmRTF21nxk_;;!;YV-4 zk74cbM8<@dVJAZ-#L7!rg`Gu`VP}c(rPquQ_#$J|5`>&#QJb(cNHXLMzDPe>f{^lc z+lG~wWLWtKKl%cG4Do|cl^WxYDC8_v+lQS+l3{g}@}99YINXuld`RA?2-PSoyFyQ_72=q#Xz%=ggoete!BRNB?xIpPUKi;q}!sfdLsOq z6Y1BS(tdSBVf94#H79(`d(F%n!rCLru<{Z9%n2X!VthoL21Q}@MEEr)d=8cAE^L@b z5#$DZo9JAQ<)WU=1HYe4EyH!0e@i#l$+Q&yq@1e8qeT}Pfxk&siG+Dzuxn})dCOE@ z^9j6Uz*Av)Y#~dBH&9&!Z^B}D%UtlF>k=L&yIVEBpcV!<}c57u{R(4-ygH<+9Wn)w}J!Mx@wk>6YQnn&x(^0k;Wg}5G24xFS zcKl>-Pj>NScTP6qWY0~u*IG9zvUbj7OHB5>WK&DFuVkZ2wxnd^N%op#dr5YbWD`kt ziewi^c6ekjM|N#wZ$`FXWTQp4RAkRYHbrFnLpC{NPeZmbWamOQD`bB{wj}x#@gX}8 zve_W}3$mpky9lyTAX@@*^Dj5^a@#I9=yKyNx7czcE%(ZD?<;q?axW`4t8zCg_ndNf zDff|bk0|$la+@c2a&ng@_hNFpB{x<7lA9;FMUopKxz~}~8@Z#An;5xoky{nHACcP! zS*^VVPQE1J>}$i%gOVV z$}6&O3utS0smx$r*`D!~;~Cbm<T% zE5|dway;V;#!OMEq2_a36U8&Way-N0GHMH@fxa?5!}ynRUY5Ik<#@(dX3R*$lod0Q z7ZNi?VH1sHmK8LTSJrTnys~0O^2+jzR~2QK=^80mmS-fdteBC!vSLQYOPFVh0`9kl znq-E!Cc-m0<#>igUm0B}b(Za!992}dYjVo*3=6(;PFS{Qaw0twPeo4aS<0DJ#<;o{ zwHU*ta1t+gP2nwVmQqco@|ws!t2$q@tUGW@ zRaZ~DxtPbWGsTs)ZxYvQF8+mG{b$CwI&sCsy3JT8|5B+x*0sjEVywFl>n_B)<5;%> z>)fBP7+lQ@XIQrf>xN=oE3A9yD_%~;x(Qg<3hO*rmw|Pwu<)OO}1VLazBPGhu@3 zvRId@7*H9P=ASdcRZEL&-H*SFT%xmXqH8=$W=m&B8jDuQqc{yeHrds#S4vfiyMg7j zVqqHii8nhPb2YBF=Z+T@Z?md)uHCBcV|$hS?Kl2zUqD5c9fe)Z*~eVI7&)He-+s(B zSHD14#b+9*cA{fWKH+N9s>j8*Trq#xstVVtGfQz-F7HFKOl_j(qv2Mrggf*|sYvAK zw-|rIU#=UpicixVkUyZ?+RXk&bNk;o=~|<|*5QE(=98K`Gvnm@ z6Xfp~yQrZF$hVwTzB#km_AlPHa^5-$yn1xLKUVN4U~+`BU{VIZIEd9Fnc7s^FmZ)7+MuMD&0z}cq3H0mR9jZs9arIr7%LJ zLur+Q2$f4qtK>(hv@ETX7on10T7|w1_`_**R%w--2$c& zCB3vt(7TpOYH5|AcP*8K(kemkS}L)nRf68NRNMiTj9|RTr8C^z)5`3b?9L6-3A)#+ z=FccPLH}Ahhok5O9c=0BkD}vvxKO19JiI$XN7gKkiyfWfC_0Xh9i8u^=r~SxbT&lM zalGv4tc#-KxY^P9EQ*ffXGiDbC_0Xx9i8P-bR0iBI!mMIIDU3?7Ddqs`nguX&vQ%Z zctiYb>AV_6C+KHOXL=N!pr0+BDN%HSeztU8h@unpv!yd8icZkamd;aAbb@}ibcRRK z3HsU685%_==x0l3a1@=OpHl*UzPFT)M6@*q3zenQH;PWs&z8<@QFMZSwsdZdq7(G9 zrE^0RouHpBoz78of_}DiI!4h6`q|QHA4MnVXG^C|6rG@-Egf$ZouHqS1AfjerBfK< zXG`azC^|tuTRM%R=mh<2>10OH3HsU6sTD;h=x0kOIf_ou&z4Sn6rG@-EuBhHbb@}i zbaYFnWMew82jq`$?9QlIMgF&sv8*Y_f$7b1_YX+sk(v+wMOp5A%_~ZOkvs{f;53{8 z`42ZVkbD>4Zis;jP!Y`ZY(F-tx=zIr?{GXsg3N!tx;>$C+d6k9iNx0kCA-K9oPzUUV+;ee`tDWW&Xnj?mjUM x+U2xuo8O^>r+NGK9emC6+qQ4pylp#ghvscBFU-ry&GqFKcyj$iFLpnr{~!8htQ!CT diff --git a/scp.c b/scp.c index 8b8881f1..2364519f 100644 --- a/scp.c +++ b/scp.c @@ -1623,15 +1623,20 @@ ASSERT failure have several different actions: " The SEND command provides a way to insert input into the console device of\n" " a simulated system as if it was entered by a user.\n\n" "++SEND {-t} {after=nn,}{delay=nn,}\"\"\n\n" + "++NOSEND\n\n" + "++SHOW SEND\n\n" " The string argument must be delimited by quote characters. Quotes may\n" " be either single or double but the opening and closing quote characters\n" " must match. Data in the string may contain escaped character strings.\n\n" " The SEND command can also insert input into any serial device on a\n" " simulated system as if it was entered by a user.\n\n" - "++SEND {-t} {:line} {after=nn,}{delay=nn,}\"\"\n" + "++SEND {-t} {:line} {after=nn,}{delay=nn,}\"\"\n\n" "++NOSEND {:line}\n\n" + "++SHOW SEND {:line}\n\n" " The NOSEND command removes any undelivered input data which may be\n" - " pending on a line.\n" + " pending on the CONSOLE or a specific multiplexer line.\n\n" + " The SHOW SEND command displays any pending SEND activity for the\n" + " CONSOLE or a specific multiplexer line.\n" "4Delay\n" " Specifies an integer (>=0) representing a minimal instruction delay\n" " between characters being sent. The delay parameter can be set by\n" @@ -1681,6 +1686,7 @@ ASSERT failure have several different actions: " when specific output has been generated by the simulated system.\n\n" "++EXPECT {dev:line} {[count]} {HALTAFTER=n,}\"\" {actioncommand {; actioncommand}...}\n\n" "++NOEXPECT {dev:line} \"\"\n\n" + "++SHOW EXPECT {dev:line}\n\n" " The string argument must be delimited by quote characters. Quotes may\n" " be either single or double but the opening and closing quote characters\n" " must match. Data in the string may contain escaped character strings.\n" @@ -1698,7 +1704,10 @@ ASSERT failure have several different actions: " to match other expect rules which may already be defined.\n" " Data which is output prior to the definition of an expect rule is not\n" " eligible to be matched against.\n\n" - " The NOEXPECT command removes a previously defined EXPECT command.\n" + " The NOEXPECT command removes a previously defined EXPECT command for the\n" + " console or a specific multiplexer line.\n\n" + " The SHOW EXPECT command displays all of the pending EXPECT state for\n" + " the console or a specific multiplexer line.\n" /***************** 80 character line width template *************************/ "4Switches\n" " Switches can be used to influence the behavior of EXPECT rules\n\n" @@ -3924,7 +3933,7 @@ tptr = get_glyph (cptr, gbuf, ','); if (sim_isalpha(gbuf[0]) && (strchr (gbuf, ':'))) { r = tmxr_locate_line_expect (gbuf, &exp); if (r != SCPE_OK) - return r; + return sim_messagef (r, "No such active line: %s\n", gbuf); cptr = tptr; } else