From bba4570a93e0c795147831ad28462e4619e535a9 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sat, 31 Dec 2022 14:57:08 -0800
Subject: [PATCH 1/4] Fix filefrompath()

---
 src/utilsrc/apple/copy.pla | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/utilsrc/apple/copy.pla b/src/utilsrc/apple/copy.pla
index d6d9c6a..04d23a5 100644
--- a/src/utilsrc/apple/copy.pla
+++ b/src/utilsrc/apple/copy.pla
@@ -16,7 +16,7 @@ res[t_fileinfo] srcfileinfo, dstfileinfo
 //
 def pathcpy(dst, src)#0
     byte i, chr
-    
+
     if ^src
         for i = 1 to ^src
             chr = src->[i]
@@ -52,7 +52,7 @@ end
 def pathdiff(path1, path2)#1
     byte i, d
     char[64] abs1, abs2
-    
+
     abspath(@abs1, path1)
     abspath(@abs2, path2)
 
@@ -69,8 +69,8 @@ def pathdiff(path1, path2)#1
 end
 def filefrompath(filestr, pathstr)#0
     byte i
-    
-    for i = ^pathstr + 1 downto 1
+
+    for i = ^pathstr downto 1
         if pathstr->[i] == '/'
             break
         fin
@@ -108,7 +108,7 @@ def copyfiles(srcfile, dstfile)#0
     char[64] srcfilepath
     char[64] dstfilepath
     char[16] wildname
-    
+
     //
     // Check if copying a directory
     //
@@ -186,7 +186,7 @@ def copyfiles(srcfile, dstfile)#0
                 puts(" ==> "); puts(@dstfilepath); putln
             fin
             entry = entry + t_fileentry
-            entrycnt--            
+            entrycnt--
         loop
         heaprelease(entrylist)
     fin

From a0cc6662d5e67e874d32f52d9c75e3a5fbb78179 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sat, 31 Dec 2022 16:02:38 -0800
Subject: [PATCH 2/4] Update large disk image

---
 images/apple/PLASMA2.2mg        | Bin 819264 -> 819264 bytes
 src/libsrc/apple/matchfiles.pla |   5 ++---
 src/mockingboard/cvtmid.py      |   2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/images/apple/PLASMA2.2mg b/images/apple/PLASMA2.2mg
index ab32847bc6c0431a6e29906996d6cf638f719e4d..f6c7818006f36d75a0e741ef5858834630c5d0a9 100644
GIT binary patch
delta 984
zcmW;HduWYu9LMqB?Rm~@Y{zzlVeBCjp{88_*eIphGFeh;N@PitP-;2*hL%Epg-7I4
za+hd$lww2^TB&74x#Z3mnM=xe^T+FaKi|vqtJB(4-r7`tzQwu2<8^v-;+hkulf;?r
zW70jj>fdmrdZGS@WWjjzu{bYEndM4#rBkXdnLEc^(y^{G6<VFBtTHB^S#1vL?)Yi7
z8Ar*hF_pS3sje|YjP6bv=9w{?v9C2vx-2f7Z<b}d`zupcsH8?KU#pA!5}lDvTFF-W
z54upkQGe=4{!k~HBAIHGpJ5`IWt7yC>&<At(m1~kTTPMQVKROXcL&%VGa0!|ZRNg=
z`hlCz_-d?tr~hS2veL^#Iac|!buxfD$VR>t<yc^yUxdZhN<F)!w!}9u-^OewJoDYm
z_c1@j{5rE+Xk&htdAlu<4y&Y-{K!V~iu#_rz&W3belBYz?Uc{B5<lEUel*HiOu=+#
z{XAFT7rA^{%uT%;Cd;TRxLM^!_%*In);cBY(THa3V!zi7kR#-y<m23&BA-PI{T1H2
zO1_30xRvGS4(_pR=lB7+1CQ|p&+(Go8+Px>pUFKu@`L<~{M!|Y4wMAQK_2qaKj2RV
zr81CQj8crkI80(UIVkf>0w>v}G|L0$8v^TB2a#;xpb^4+OOTdk>dv58c2naZU-nbm
z`0zeA9q7a(Ji`mT#yf7hc&mrp3l}O$A&m?MV<<+1Dt@@hq_civn2||LCWp#T3nQtd
z&Zbr|t08X)oou8whR$b0>rc|3p+84|A+&OlyQ{c{o4A8}XvYI|pc7B<9Ix;epLpX-
z*r&h`N;y9?6~(6~*s*bTh$)C~Pq9(_XLu?n>8dkzy18PZfrUeW5GmxK4|0*0R4nYP
G$NmK#0Tqz|

delta 1001
zcmW;Kdq|X77{~GRo^#%JG({aRODbBvT^!u3B?G%bMi7x%MivBt3)XHCQ4}RC*!UD(
zh^S7KZ&4IMBt^?cZM-Z5Ss@q|LLdk(#da@^EV2th?sxZ(&pf~9G6x2xt9^P``}8Z<
ztUXp;mAyN*`(o?GvDF7tc_U-gf5Qptsro;}E2{O|lB@{{y-um2yo6dA*Duo7J?~)0
zVm+_3Zn4(Uye0aKHyk}$qJOl*$)z>X_pLgNrZwnNFBR8Qv^O08x=g1$u8uV7b}tnr
zm+Q6Z;iS^3d?gK@a*bYrYxW9dr>A5O{g9V0pQvBGP?T2gCtV=3sB?8F3$&8u<YqnD
zZPeCn$6j6F4(USI!QE+g7j&V-)LY#5P=~mAkB{2OXZmltJT0R<lxdVp8Y@3gi%sZ4
z)S$^&w;F4Vk!E%+rrd2{et_9w9A$o-`AOzynRhYkMi29Q%zI6_^cf}n<N*`P3+f<u
zfwe9RIW}!1X_YIo<!-zUT_tK*%)}gPT%*l(t8I>~;ilP^$vWzKZZ_HRZi}suZC1$+
zv|&FS`^Xl_Ir4dOCpVYKzvEB(zj*5g`6h0oJI%*k+-KR#@k4SS{>EcG!E<)6*bS23
zlSg>u3;7%QyDbpyD+!Q^Y~&)}=STS!GL~G55R)(kGuYMomF{QXO1g#S7vH)KzHyuV
zP+B=?!!G7~{5;uDJ?xjraq0;_M@~_D_~HX@`p}O7{DWtBi8tK5<*gC&DEvT429hX3
z3Cd6rsI*KZRH6#i0e`ZfP-c*8$+Lq{=2I6^>zOSjw+2>zqqYUswFkysq`yr62mRH+
z$aU^+;3n?iF7Bfj57CEyJjRotSjh{*YrNx;4?(UgPFPo#2%}3=O;waG)wxl3tqG&i
hafyt0ut_(0`|4I{7+ClSkU$19F$P(kb*r+g{sp>38L|KX

diff --git a/src/libsrc/apple/matchfiles.pla b/src/libsrc/apple/matchfiles.pla
index bb1339e..cc5842e 100644
--- a/src/libsrc/apple/matchfiles.pla
+++ b/src/libsrc/apple/matchfiles.pla
@@ -15,7 +15,7 @@ def matchNext(src, srcofst, exp, expofst)
                     return TRUE
                 fin
             is '?' // Single char wildcard
-                if ^src >= srcofst 
+                if ^src >= srcofst
                     return matchNext(src, srcofst + 1, exp, expofst + 1)
                 fin
                 return FALSE
@@ -103,7 +103,7 @@ end
 //
 export def isWildName(exp)#1
     byte i
-    
+
     if ^exp
         for i = 1 to ^exp
             if exp->[i] == '*' or exp->[i] == '?'
@@ -114,4 +114,3 @@ export def isWildName(exp)#1
     return FALSE
 end
 done
-                
diff --git a/src/mockingboard/cvtmid.py b/src/mockingboard/cvtmid.py
index 3a11989..f50034f 100755
--- a/src/mockingboard/cvtmid.py
+++ b/src/mockingboard/cvtmid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 
 import sys
 #from mido import MidiFile

From ec629745f9629d07cde3d2f14c0dc37dcaa7087c Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sat, 31 Dec 2022 16:36:35 -0800
Subject: [PATCH 3/4] ALPHA 2

---
 images/apple/PLASMA2-BLD.PO | Bin 143360 -> 143360 bytes
 images/apple/PLASMA2-SYS.PO | Bin 143360 -> 143360 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/apple/PLASMA2-BLD.PO b/images/apple/PLASMA2-BLD.PO
index 3ca188df48b6e107866a9f5d5915c92901b0a05a..2e506669d1602a992b2bd9606e0983150cb242ce 100644
GIT binary patch
delta 10970
zcmajl30xF)|G@Fz4zrvB%PObBE(;<ca)}p;fF~N_Dr@<mmIrJei7D%Pq|Z8<9bUDK
zNtsvKUoCy|z_c>8EW6D!&AYtFwA0c~{eNZwUF>=N|Gi%CneY5&zQ1#3cCnrHmH(`-
z{5N%%gIBgmG$e@gLTG_%l@nU8Y-2J=qNTOCu(Y4J{ol=dMW%RvnCG%P*RPNh<dtm_
z3^jY@VSYNl8l7}nw<V;zfokI#s*R)CxR{(qC7~j^d;gL?{nM?*MRiTc5ke<k(^0>7
z;)?&0*sD*so&&uSqey&K>wk-e7F!t9tN$(0T59u7j3e=~)}nV}t|`X5^Cp8j!lZRR
zwxRM^1D)?Zu((e*uRgS-sx^0aexoPRYdE1IwWx8XoGg5V-iJPT)nD_s$&_<<lg-Jr
z^(pSz(5ReFlht?k-fGkO>NTEFk<zEc);7B#O$a%QCe4kSWQA6E5={+*G--n@?o-mU
z)GIMZYw;fw?MZCjkl2F6$l|h`J887op2UK?6LSYOnrQkkVo;;bYZIN)um7OZ+heAx
zTsp7QI`1_`bz|d1tq(EQ{!G`M`%BKJ4~w)uc#W~<??I;2yC*uOv`4Q(+nxT)B{Vsz
z(R{^nN6-4l9o@Rr+DB`(Aypno;#P?!Z_iG1CVEy(NTbyb<)O*dy)-*HsJKw7;9+Ps
zM!a7W^y;b5CUz;++@si6q?(;lP3@a6>Vmuq)W>%WiJWRG^Bvs8*DmamUGC~{_qF@m
z18q~)-*+_EEvN~9J3-f|61C&bgSy={fxF(2b<@@N_MB$>;(Ix|=`}~+>!{Q1RYUg<
z3hUO&?r)pd%IWKrske!(sAlrs36gHTdhx?`y7e`SK6+Zx%~4ICX0sjmX%*WKJn`?J
zF3`_O&9n_w=Y7^jH&lJ&vmXMV&vFDf{G77wd3E!?y`kk<Wr4OisRLt$O`l^cSLc2{
z!?i5Cc>Ar<Ul<3vh3)w)r{vH%eXYyI=wrr34&B&OMyGG;ET>d1iv2~JEZc@Qv(6G+
z<T)cbCF>+1dmWW~j=nUKZtERaDVH>4+2xMX$V#b8NO8C*7Y0j1c}D68DhXi%rQ2n8
zc_e*^5&Bm|<*oOGdh27c{MKROqhhuC?EVZ(d6v1%f3RK%T7DqR=~J$AXtC``c5!d5
zbGA9^rTwPJqO2l%ZHvmX?ag9@Nf}|Aq~W%!YKsFM+jt7?KBV_5xps?@m+1$~B&H5b
z6^zX;CRww@*!qE}%7ON}$?6*i3Y&02sjxSrI@=~ye{hDbw>tY^cGA}tXN28<k<;Ir
zBkX})48_4hq$b-9wrL60Ai^ZOLD=@HCk`fhUAkV_wYF?+5}bmTGwq_>w=BlGSP0u>
zHStjE#ATL-6QV4}E|vI^Kx8ZJ>onZ1v+7U}KYDdTXRB3r9m>v_lbX6ZF;XNOY^!tb
zOuxaQxB6=XvPEamLAjVIk4PP9Tc(;0n{~_7g2U;tlRIZRBN$og28&);!?g=m*p^u;
z>#m!B*c?oUBCICu#B4I(IGjc1w}(w^O^2JSEsq$@v>8<2j5Si&jm1W;wi|6<Yt?8;
z_Z`Xk|1Vm9<i2>Vt#aQ@`b7?3;gBVV-X3`Wjm6GD=Ci)%316hqvh@pduBTsx+RPW+
z9+=kEbgf9LD;myFC~B@1c@6*7FOr%y3@flpkGg9o(a{TEbdrMGsivbDX6;4_WA3$E
zsidV-luL^oQvDs}r`=JNM^j|&ochAi?6|1JN?|L=b;w*Om)G6aIvyO)(_F4zIoc}y
z|Gp&ANn7PoS;%029gP;K1;^5QdQv8LcKA4jwnS&Or^SDkr`lAj-Pfj_x68J2t#K}s
zXxyi9<Gwucn~#~aK^;1lDMe?f@|StKTD9AkLzu=DY$vPxPZbb%J|3G!eX?yztkqZ8
zhGt~iL|(~n+G`^9QSIKCD7dxtG4>GK*%<9+B`t<Yl*@gj9wp!1l5J9iGsG^Z7IQ^Z
zqI%|d^I-1pJ9VkPCkEBEX7)-Wp@dr{D$yx>UHbNkfp;Z0KN(k-tSwwao1WGpwAL1#
z%nj!uIO>@pi5a^67@t1bLOZk5^QJLy#xqqumA>kT6P+1%-&5(n+7ws%YXuQrwQD1H
zCzg7i%(^);oKBHwtn=vt-@5rxmD3;9bt}><ktLZDYmc#QiRQ)p;+bekpQFBgW=ca&
zr?c%78qG}oEHAv>MQaNdKz-)yI##OlS7o%Y<f|0=`p#D~W1};K?Rw`*xj0Z;dKPPn
z_UJj|gk)op%f4<K!xe%!vu-Wpg|!)13O*&4scXMBb(@na7nG$B4wZz%S8@jP5=uRq
znBl3!k5{<ES1UQ0==r>G$PT?TSeuB`TIZ6rdyf~b|G74CyW{vg@thCf#+B^><$9YT
z${EDN#tF6bT+8HQleHhOx8g)G`hv08AnbnS+Q(+FtzEn|_|DO8b=A3~CdH<*(7|!M
z(!*%r(76mg<D~PJAzpoH>M+*5s=WJ>nkhM>gu|fqv0)f3v|$*$hoPlL{bLxe^A_V3
zlRaijlru&<xxrF>i+Qg(pBQz;q!m2w8MJoOXs_zBxWPf{59cF`^f{TC)6a%kcW9p-
zb@!a-Q&L-p0Ih9FE3dobv`<gw!zrA4ryr9f+5K!+Ox9UCn{RKm<U(^-fOf6YZG*q(
z5ue>ndl?1r!q!?8WkGgNv6AR3WUG(xU*Z&!Q?I3*Oynuldg9bK9@w2%zTlnbFYNl9
z*-kz4uDAL3svG9DTh`0krw=nW=1JZ=X+lTEce*beK9WP$E?Ae?rvAbp-Yp9pK3ccx
zD!J@=HN4_=U(}sho!Cqy%ibSET8=$H9dI#H?^7<@{!+(ZY%TfsRhM2&?;T_=3)1Ra
zo|s?PkXE0+*ApCW(bDVR4QWEQr4*I?>S@}0b=1&H9nyEj+cw4vhh(05(OB2{4)vXn
z;MKaoA=SMU{AF%HZZgLuOQ+-vhG@~Q%CyzyWG0EGZ+~x`q;=@dz<7SNcSgfWDq(rl
z{g)D>7Q_`tizKs_Gt$YRxx33H$!1Z5YFq05QnP9^Gq1$kMVTKrw!x`=ff)FmPB4P9
zIIVxrYGakP+soc8O-M_e+Oy@ZO-kHI_q4h1c&Gci1$^)Ed^Kt4{>j?t#QMcpofs~X
zzA^q|&Lhf&ZGjr~&2Tz1?VI$@Q!MrKm}=0b@%pWDo$dV?F}2os=iST8NKCz8)TW@(
z1fTn6q;87Z^KvKo0kdtRI{R{R@1YsRCq%k$aF0S;VXjSxhD!YVQc3-RHrkRKw`}vH
z#-0otdpzt>u1hLt>UH&M^{30xQ7jx?(OP}Z5_-EPk*8X|ou|vL`Omjob-FjzkykSU
zQ&UEdF^)Bedo$IyuSVBwy&9}@_2%`r0J~9a64F#$!C$bLh4cX0#S4j6q+PgzaEp+p
zU>Uwfn*<?E!(K!s3aK2MP|{LJ{gZ?=9edHOm5}D4C|O9UDMDJGB3#m(RKbU<kdiSJ
zS2L+3OGw!$LOGttUM$NN(h=x$gtQv92yQ2&f?Od@?kuG15P3rK?<FK(zT2i05%(2R
zDOTSjq&NEsw?Q_#qhueYxh&jqa?S4V`^v8VAwn65K^TE@Jcz}p#!`HUPp}V1aT@1P
zi{J1k<WQmbAqb&phB(9{2`OlUOmsjlx`qmuQbaHq!!Q~X;J_@*!DDy|tFQ*IVH@7T
zUVMblupdWp9H&u>-w<LDN(|zVihK+~1;!a%LYYV~1v3r8J<DKlKW2zg7IC~7OR)-T
zIJdzNqHH8SLVTR~6!BT&3&gd=-x7aE{3G!-;@^n>B)&=P6BeTQh6yDgOt_m6hY}l!
z!(ALi5i}1oC>HiDIZozeYosF!c_=`4@a<9=g8N~|!<dYzm;o0a!;@HuYAnS{tjA`&
zjyJFauH9_*U@tzxr}!KPafA+iNrz4npTXC-K-o88M&&B;5BM3s;y3(>o6s4#AK+&c
z?jWO431J^*3{_fFmX0iryHH+eWc_<ka1Z*U3XkC5cmfOYG#2AI{15ixTLd;0N_*Uk
z*?0+`<9oz66G|b*V<FzeadZtA%6*uE{0QM*6yXYYzY-Cy9Ef1FIF3`efNvoph2oDO
zL?9kXXdNlsxsfKNFY#au;rP)=ll!SigL_G2i1IvT%diKZ;RfgPqe9)qQ3iKuRETna
z6i*o@4384-1yLqtB?te5YaGW#o7^p<LzT>E)*e034^|9A6`YtBE!;DsP0C}$^Ra~E
zmE^7=cMHcmuv`89dUID`3=bqM$U<lIL@9=1I7VSSrsHwU$0Af?DVAduR$~ob!3J!^
z>v#iiV-G&XQJlc(7#8^)!DU><kGO`v5!jsP01=2rEX+tn4mzO#y})-wr3??ij)&mH
zEX>6MJc}3cGS*=|wl?P>e}iBb_Fyme;RsIRJbYX5aH0teXbLkDkc>>UMSJ9;E4ra4
z`k+4sV<<-9L5#&DOn0%FjrrJ!E!c*)uoLg%eSD04IEW)SiHrCFKjS)n$KUXY<<$lw
znj;PtBqIkM&;{M#Dq%AK_u_txKn2EO3Z}z_xo~4Kp2v%L8SC&G-oj4o!6(><gE)rs
zxP&YC34cSx2}K{r`Uevj&<rt1LJHE6g93C%5lT>oVHk<A7>|jVf;o5$^Pyr1mSPn)
zU?aBTE$qSHajd^&q9+JI6NI8EB49!y(vXGr=!^pN2Hy>o0k{{#FdU=s5FSPqreikd
znS}c(ljMHYBrC6Ryct_vY_{VqPVP3Dl=p}~#C{yb3Cb^+B&C-42jZq?S&1|=Q)c1r
zM4U%lfbJakGB;KFvhQa$DFfI$IX{j4472QZnSGQwT=y8q3pnp4UJO??o26KeRd^X|
zu^wCSI(Cq>i=_97Kg1{4hXXi_qd1PQaS504BmRVl=Y~W8n!tc&h(>HY>z_=}8tG_@
zd~`!G$}kM0QH7~^1PUI-JS>D8&tf@V#0K!yOxc2McoRGE4nD>qT*VxVi%$;=iCB#_
zcm-Q=1_=q=jL1M|6k;HTU<{^UI%eVttU?V$BBKT0`;>U3q76Es5Jk8LB`!7ta3AL3
zX{dM(E3p>;!8W{!w{Z=krBK4r4tXd*KMccgDA<hccndr6BLb4hLpE~Z>cgfO1MmRs
zn21L)A5UX7Uc*^j#x?v7sTCjOFd_+QXpemKK{3kk5FWv+*o58q0H3#F{f`sW;u_+T
zh0+o|aUVva3ezwH^YIL};X~}h0i4ApM5S<3p#!?&emsi#*nr(Qgp2qQH&R&tCaFB<
zNI@?8;$NtO6SFZ7DwbdsR^t_Xio-aHbGVE@a1#Noc@4vaB%~uB-BE&4l)KoB!y}jt
z71dadb@&gqVmCg*ejLF?Tm^q>D|$3ROSDB-l;B?&hT$m3gBXiSOvFsMo?^2EAL2N!
zL2e_IU_`)#WVA*)+MydBgcEb{Bo^a&ti)=(f^FD=-S`YYL8MbRq7a+T`X>;yK{nc<
z3kpyK{_Ry6guxhvv3MAh@d*A61y5i;7C}WdUdG4x65rxyT*qJV%i#M3f-_iuBS9ou
zARhe5rL;j?v_~i8qZ@joF9u)`hQN+7cnA|Q8MCn#+wc+g;Q$WfOPs-Z)VkPQ#n1Q^
zzu_iynJfcBVMI8hkd1aIKo1On6LaClN^HVbyo*ct6}l`&j7W6BJs1JkBsP;V6*KWP
zp2Iq9#&+z$yZ8+IaR|ro4Zg##kg}Opgu;k$BqI|A=z|iJ;$95Fh-}vXL4vWU%ogs+
z*&*&3*&)hYj-SDHd;tEsRgU8n&f^-c<0b~QW%@AzRdC@6EW|T-0qd|HTd)mp<3sFg
z%lcm+sKqb1fxp0?((b^VP$eWsC}D^|3s}$+>BvDY^3V&#xEJH`Fr1i)*;s(Z*n(Yn
z51-(mi_Ixq#h(ah$4diFOv6k(j)ho^6<CWccpdNKV|<PyIERb4j$4r0vmA(l35iHU
zI~2gxolOZwVj>)vi-lN)HQ0*X*oTw&88;wx;1NPN(vXMV7=Ymzjft267oLP0OYj0#
zcVPWD5NyX=IE_pA9ycI5@>L8GhzI|GrL;jlx}i7vVK9bZI4bZksxTW*U@2b0T5Q4&
z?81i~S^pCR=WrRn;1B$buugnafe9JNK|XrJhQSz)aj3*3%)necffun3o3RzUu?Gin
z1Od6U;bPMQCRorC$;d!^bU|<QMG5Z1aE!_o?niQEMa!R!xmbXwP>q+d78|e;HQ0d<
zupftT0<JS`&fy|1;}`siTaY^Q*AD^^h8Adv6l9<sI-(a!P>Opo6c6AbOh6TuU@4a4
zRcyw#&aD5t1fSs;PU0Lc;WEC*HSjN3%1s1y;psqAL?8whv_U3v&;|J@!aXR(IQ$z=
z;3aIvR(#UMCEWYF$nGOuB;^<dXK)^u@dIw)Pw4V^C!h&J5rbI7BL#)%iT)UjA*jGO
zOvDsS$1FUV$KL^YdgU4R&${wtWdnt8VJ8JAI6lq(t318?e4dYTiTD@F{^0yg_;sZd
zFd`gLU4^?vSG{6lZ|N#4$&{rLcOvdWoR9A4g}&&A!5E5>aE)VAiHUHKIF-sCVgK*0
zvU@3&ET?=G$1iu)yVrL0QC{WvU5>AC{`;=6?w`8GDZfy512++n&k~_ozHmq7hr3gV
zv(W*$lnu_8l_A6rU}Qe)KaSvGRACBca*>iBt~^P+2yQ%!7bssz`C8%)*oYeJrhHF+
zoU)hrBkac^%D%{NsvKv3igRZvJBQ1-O4$#byH5OjzDv0O;=reXsYM_RXo^@QpcPV)
zS-?N+6f{-3689j!r@*9G*_X1vkFsIJqliZnk3%IUQsyiOQKqq<!LbW-@EGP%<}T;t
zVuI=di?W=;Rm7{QWF7nU>^HH0gZ)nS@34QLYd*m~9H8uQfyw<{fvo&Ue62usUoY@+
zhZM?6SfOw?E0o=lg+A`0?c4lyzPf5DP?x~JPDw)Fs&x;3iPW=H`<+W6KUWd*<3bjb
z^!&~xq2X6R35IHGpicXRjMuMi=89O)Pq*&m%8U3>&RFd?Oz{nw@rLRZb(vn3%@wJQ
zn-sE2n*+2q%?+7mL-p0VOiM$N#V}X2)_ynT-P`AcUc~v4dAn<5<_77sUnAWvG8w8z
zP{aVd>Ypnj`}Hqr7`A8VFEfAuZ2(?vR&T7!Y&3w@OxC|jdk$#Gme=y*pm((&2i?w0
zFl_%jNN4Irqh8a&2nJe9x)&CAzn%J;Xet&Y+%<OVKu>oYXO{NrS8DbABB^erE|9rG
z%k;XedPQAkqwXeqPnovHe~2Ld0l~Yw7UsJy(`(k|iWb_B)V#7~Kb=n0YCpX4YM?r|
z)HB~+lUqH4qIO=>p)FpT=SPCJ+xME>l;3{EHkvgqQ+1McjZJqTBqPJ@sF><7SB;uf
zQBhf)HA~m3+EJzpbCq@<_<+?m(41#Z%;f)429KIhS>-TmrKNq!dQzN~nVl0HJaU?&
zVn{>jFmvgsNu?v46`o>qpWrDICY75@MvSir4yK_h&Um*LJicQ5sE4N|7u08^d8(&T
z0#|)QDO$s0CghHuFuo!=CD=Y;lDSV_rr9yUoZU9qY_2=`-~`8nsne4Cr1eRm?BU6d
zQOT_eTebE&GPkNfGbWkRN=95?Z+&W3W}3NON-(Ka$(H*@k8rrmW2(&4CQP1WuB7{x
zlwfTXjQYU}u4t9tYDQwm%oMYkQ6+Zkbyr>4Y32?Mb(M@6#h53U$5&K1wEEJ_)a7YL
ztFU2o4ZUce#<Y6Q=hF}Cq>8F4^N7l6=5ZC%%<1Xrq|*K<=AqHJ>-t_lnVxksHe-Qr
et_hNK5!!4vo?vbLwr8a24(e2c6#dd7-~R={w+h7o

delta 10212
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

diff --git a/images/apple/PLASMA2-SYS.PO b/images/apple/PLASMA2-SYS.PO
index 78e7a2547bbc5e204d34f4cea1f631fd27be1150..fbbe3714b99e179da0680ff7583c791eba996af4 100755
GIT binary patch
delta 5948
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
UCn>^V#W5dTGsDMb3?GsI3ud(oaR2}S

delta 4055
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
WG>J+vu{b_Pe8>0GRQyl+82v9&V$$3I


From f8a6589f34490db14c8870d9a5c1610a02072e63 Mon Sep 17 00:00:00 2001
From: Dave Schmenk <dschmenk@gmail.com>
Date: Sat, 31 Dec 2022 22:41:28 -0800
Subject: [PATCH 4/4] Place common routine into matchfiles

---
 src/inc/matchfiles.plh          |  1 +
 src/libsrc/apple/matchfiles.pla | 14 ++++++++++++++
 src/makefile                    |  6 +++---
 src/utilsrc/apple/cat.pla       | 34 +++------------------------------
 src/utilsrc/apple/copy.pla      | 13 +------------
 src/utilsrc/apple/del.pla       | 18 +++--------------
 src/utilsrc/apple/type.pla      | 30 ++++++++++++++---------------
 7 files changed, 40 insertions(+), 76 deletions(-)

diff --git a/src/inc/matchfiles.plh b/src/inc/matchfiles.plh
index 9c571d4..f60b27c 100644
--- a/src/inc/matchfiles.plh
+++ b/src/inc/matchfiles.plh
@@ -2,4 +2,5 @@ import matchfiles
     predef matchName(src, exp)#1
     predef matchList(pathptr, exp)#2
     predef isWildName(exp)#1
+    predef fileFromPath(filestr, pathstr)#0
 end
diff --git a/src/libsrc/apple/matchfiles.pla b/src/libsrc/apple/matchfiles.pla
index cc5842e..11da710 100644
--- a/src/libsrc/apple/matchfiles.pla
+++ b/src/libsrc/apple/matchfiles.pla
@@ -113,4 +113,18 @@ export def isWildName(exp)#1
     fin
     return FALSE
 end
+//
+// Utility routine to separate filename from path
+//
+export def fileFromPath(filestr, pathstr)#0
+    byte i
+
+    for i = ^pathstr downto 1
+        if pathstr->[i] == '/'
+            break
+        fin
+    next
+    ^filestr = ^pathstr - i
+    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
+end
 done
diff --git a/src/makefile b/src/makefile
index bff11a6..ce2e034 100755
--- a/src/makefile
+++ b/src/makefile
@@ -485,11 +485,11 @@ $(MON): utilsrc/apple/mon.pla $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/mon.pla > utilsrc/apple/mon.a
 	acme --setpc 4094 -o $(MON) utilsrc/apple/mon.a
 
-$(COPY): utilsrc/apple/copy.pla $(PLASM)
+$(COPY): utilsrc/apple/copy.pla $(MATCHFILES) $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/copy.pla > utilsrc/apple/copy.a
 	acme --setpc 4094 -o $(COPY) utilsrc/apple/copy.a
 
-$(DEL): utilsrc/apple/del.pla $(PLASM)
+$(DEL): utilsrc/apple/del.pla $(MATCHFILES) $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/del.pla > utilsrc/apple/del.a
 	acme --setpc 4094 -o $(DEL) utilsrc/apple/del.a
 
@@ -497,7 +497,7 @@ $(REN): utilsrc/apple/ren.pla $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/ren.pla > utilsrc/apple/ren.a
 	acme --setpc 4094 -o $(REN) utilsrc/apple/ren.a
 
-$(CAT): utilsrc/apple/cat.pla $(PLASM)
+$(CAT): utilsrc/apple/cat.pla $(MATCHFILES) $(PLASM)
 	./$(PLASM) -AMOW < utilsrc/apple/cat.pla > utilsrc/apple/cat.a
 	acme --setpc 4094 -o $(CAT) utilsrc/apple/cat.a
 
diff --git a/src/utilsrc/apple/cat.pla b/src/utilsrc/apple/cat.pla
index e7f131e..87d4d7d 100644
--- a/src/utilsrc/apple/cat.pla
+++ b/src/utilsrc/apple/cat.pla
@@ -12,23 +12,6 @@ char[64] path, wildname
 res[t_fileinfo] fileinfo
 res[t_fileentry] fileentry
 //
-// Convert byte to two hex chars
-//
-def putb(b)#0
-    char h
-    
-    h = ((b >> 4) & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-    h = (b & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-end
-//
 // Copy string with upper case conversion
 //
 def struprcpy(dst, src)#0
@@ -46,23 +29,12 @@ def struprcpy(dst, src)#0
     fin
     ^dst = ^src
 end
-def filefrompath(filestr, pathstr)#0
-    byte i
-    
-    for i = ^pathstr downto 1
-        if pathstr->[i] == '/'
-            break
-        fin
-    next
-    ^filestr = ^pathstr - i
-    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
-end
 //
 // Print out a directory entry
 //
 def printentry(entryptr)#0
     char type, pad, eofstr[12]
-     
+
     puts(entryptr)
     when entryptr->entry_type
         is $0F // Is it a directory?
@@ -88,12 +60,12 @@ def printentry(entryptr)#0
     for pad = eofstr to 9
         putc(' ')
     next
-    puts(@eofstr)    
+    puts(@eofstr)
     putln
 end
 def printentries(pathstr, entries, num)#0
     byte page
-    
+
     puts(pathstr); putln
     puts("=NAME==========TYPE===AUX====LENGTH=\n")
     page = 20
diff --git a/src/utilsrc/apple/copy.pla b/src/utilsrc/apple/copy.pla
index 04d23a5..ea16d30 100644
--- a/src/utilsrc/apple/copy.pla
+++ b/src/utilsrc/apple/copy.pla
@@ -67,17 +67,6 @@ def pathdiff(path1, path2)#1
     next
     return FALSE
 end
-def filefrompath(filestr, pathstr)#0
-    byte i
-
-    for i = ^pathstr downto 1
-        if pathstr->[i] == '/'
-            break
-        fin
-    next
-    ^filestr = ^pathstr - i
-    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
-end
 //
 // Check destination path
 //
@@ -115,7 +104,7 @@ def copyfiles(srcfile, dstfile)#0
     strcpy(@srcpath, srcfile)
     wildname = 0
     if fileio:getfileinfo(@srcpath, @srcfileinfo) <> FILE_ERR_OK or (srcfileinfo.storage_type & $0D <> $0D)
-        filefrompath(@wildname, @srcpath)
+        fileFromPath(@wildname, @srcpath)
         srcpath = srcpath - wildname
     fin
     entrylist, entrycnt = matchList(@srcpath, @wildname)
diff --git a/src/utilsrc/apple/del.pla b/src/utilsrc/apple/del.pla
index 3129ed4..3fa3108 100644
--- a/src/utilsrc/apple/del.pla
+++ b/src/utilsrc/apple/del.pla
@@ -25,17 +25,6 @@ def struprcpy(dst, src)#0
     fin
     ^dst = ^src
 end
-def filefrompath(filestr, pathstr)#0
-    byte i
-    
-    for i = ^pathstr downto 1
-        if pathstr->[i] == '/'
-            break
-        fin
-    next
-    ^filestr = ^pathstr - i
-    memcpy(filestr + 1, pathstr + 1 + i, ^filestr)
-end
 //
 // Check filename
 //
@@ -81,9 +70,8 @@ def delfiles(delfile)#0
 
     strcpy(@delpath, delfile)
     wildname = 0
-    //if fileio:getfileinfo(@delpath, @fileinfo) <> FILE_ERR_OK or fileinfo.file_type <> $0F
     if delpath[delpath] <> '/'
-        filefrompath(@wildname, @delpath)
+        fileFromPath(@wildname, @delpath)
         delpath = delpath - wildname
     fin
     //
@@ -115,7 +103,7 @@ def delfiles(delfile)#0
                 fileio:destroy(@delfilepath)
             fin
             entry = entry + t_fileentry
-            entrycnt--            
+            entrycnt--
         loop
     elsif not wildname
         puts("Not found: "); puts(@delpath); puts("/"); puts(@wildname); putln
@@ -156,7 +144,7 @@ if not except(exit)
                 strcpy(@path,fileptr)
                 strcat(@path, "/")
                 delfiles(@path)
-            fin    
+            fin
             delfiles(fileptr)
             fileptr = fileptr + ^fileptr + 1
             filecnt--
diff --git a/src/utilsrc/apple/type.pla b/src/utilsrc/apple/type.pla
index 799f9f7..eca4438 100644
--- a/src/utilsrc/apple/type.pla
+++ b/src/utilsrc/apple/type.pla
@@ -8,23 +8,23 @@ var arg, type, aux
 //
 // Convert byte to two hex chars
 //
-def putb(b)#0
-    char h
-    
-    h = ((b >> 4) & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-    h = (b & $0F) + '0'
-    if h > '9'
-        h = h + 7
-    fin
-    putc(h)
-end
+//def putb(b)#0
+//    char h
+//
+//    h = ((b >> 4) & $0F) + '0'
+//    if h > '9'
+//        h = h + 7
+//    fin
+//    putc(h)
+//    h = (b & $0F) + '0'
+//    if h > '9'
+//        h = h + 7
+//    fin
+//    putc(h)
+//end
 def htoi(hexptr)
     var val, i, n
-    
+
     val = 0
     for i = 1 to ^hexptr
         n = toupper(^(hexptr + i)) - '0'