From 6df7ea631611de2be5805d56ec7a0753b157f676 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 28 Aug 2021 16:13:31 -0400
Subject: [PATCH] *DIR ^/^/^/FOO/BAR/BAZ now works. Phew!

---
 applecorn.po | Bin 819200 -> 819200 bytes
 mainmem.s    |  24 ++++++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index d854eccefe2b0f74202a0973e6f76397642069f4..b069c24dc063db49cfe72448bfa97a9e69d86524 100644
GIT binary patch
delta 2310
zcma)6e^6A{6@G8u-eng75mfL;@Dc%8_AH8-c4$Y8O0CpJ1cjE=R2Rfdsxp#xQUB6M
z$E9ZCWoQ|_V`uGbXhyRMZ?l362|@tZRiKC~aXS4&t<-^%*2OJu5^Xf?dHX=qKicW?
zF5jMW&pqGSbH4jzd9^IB_BQKvaf!_*^_ePkYj974SQ2&SX;7iTQ4P*&a7}{<S#C26
zv{+bbiA&57?g{uMK2ay+Zdw0>;@oXpw`|#1T%NmK(7Sa+IAwSqw%8)h(+TGFB_*$H
zEZn-SScrZM9$m7~@#3>Ey3~@C*nY@xm+;=TQhIZ3TnTrrm1ujSE>-+xLPvtQ!YQ6>
z7Il9=m7+@!bv*q8@lHdl*wCu$XqDbF<PLp0>be@Z85|8<ab2YT&!?xyry?{w@rWv)
z&}-K}y)rl)Xk%TYfxyVkz$ic7CRM!9riPyT@EpB2IW|odI`)@`G&~lWWUfnr8~p1w
zDJ9u;X|&(f73?3yW30=Mc#{{lOUH8k*MhF!zw2$o48!A7bSy&ekB>c!(8!k$dhxv9
z@9GMSj^ggfgYft}JkTy}+B|D9ms;)R!0>thK))JudHnu(WIS5R#PoyEY`vIAWuK`T
z<E}oSV}Bj{Z0a2zcR||SdG3NVN8j1`k@Q&C&@G+q);DnPMXBWM1`>yT^NMGSiBA9C
z`yaGo-=1`ol9ZSgJ1k8LTZEqLG;E}yr<3yMatv*JN^gH<Q{sV{!R<je{TW|dLGqH&
zvmR)b#cgz~aa$b)ZX>U+AXj5d&~rMS#qzDMlJiN*hu-sT?H7C<ogaPNb+NnWlU`(-
z>exa4CMFeuN05S4S=Gxn0u_1#-|Kwx8qtel6&H7sj8Z#G2RE=6)xCZSw%>Z{`|zo7
z+t~tjV<EWxECt+iSt>Xefpamq<Jl5WntIt%P=4LZUI67cy(|rs=3cf8Xc<4alawE|
zvkdigCb)epOZ~P&CAhTwIYH5&9Na`RGNMGxq;av>89D>fxdpaJ{fCs||D?3I1scq3
zd@u8^5Hz?2SDDN=?;>f7=D~?1!2EO7<cVql0}0@rt0eRKT_i8oKGR#p&bxOJQ0+W5
zXlNCm-bGd}L;E`_^%}K^0-&`P&)a?Yv@|t_q?VifMm0&!Q!whsz_zIeZ~O?nFCktp
z1+PV^fc(&QV7@HnRS1;<>&Q}m0-<t#%ti|4;Hg6O$h8f?4^)y=eyf@o)6`_!Ksg9(
zJ1B>Mm4R{?Sh*TFQu>X+Z$Aqh6i`LTTne&5WA@a6x8Shyb{{^>)TeBRlY&wPCq<>4
z+bT)6SjXS0B$kDCt>>{ocUZhNn)Fb0LzQIlOHTmvreWt^Q#<!lmH+Y%@a8KvV2?nl
z1ojw|N8s4No`CWg9EI#DPpKkV##y=Yp526!B9!?Td~X%WK|TD3%$&E(|9$S583&Jf
z|BuOgUs227l&|QmA;HRSn-yXWiB@*UtO!=e8pm2i#9QN-|MCR>sXr1YDyS3Hu>!tg
zH_1M#w_*^nI$l<8n{h+AW5!v#1;++=m7_3~&hu-haQfbKnM~a>%g6FDG_(d(wmarf
z0U(<^;g*Z!bTwAHuk}T8@-wT6xY3r}ViEnbneNGcV@62O7~&(lNfNfl1X{CWztQhn
zt>0>sqb+Ao!TC>ceg)32!TB#xcEaE~vt(p?Yb<`Uy*iUIUT;OyNvuwT)fr<|o0FrK
zq3N>}P!3G6q8^xNRmy?stWL?Q<j<CEn~F%RtPkhCr{?)prH3qdjiXmolgqc%lx9G=
z@M@A7Gjp2ztI6_G3|8u3aA(*sxH7z4UP6ypXukyo8%`Y5HO*J|RtDqICI5-uve1Yn
z)t3M4twSeryxFLXt*Y)yRNY-E=BxIQ^rQ2^hSq>F3d8H7Fq9pIKjcT@>JP!@@j*Cg
zsK<vK;h3SjVlX00jXtoc{b}s8#P?Zd--4islG(`Y@cvyPZ0ZrEGj<q~AKC;DR=U8Y
z8%EH1O&{Cg^e<pQUKt*-gRRvEEy8`=iS4O_(;YB5Aphe8rbj0dn|eCnOdU+h(~b61
zuaocVeIVL9H@{Af=<(7G?j_4aJO6AiK`&ppkCY?q-$&LXc=nNMig%y%RmkfOGkxC)
zJ2cis?Li^9O7%Do@^|->EMBpn%$;)(d?GspJ{>#Ef4-mOiP6nk@e977hGZbwcWX!?
zav!N7_eI2g2M84tW(X!V0)D!dq$T(?QqAY%fm+gn^}O*W$w|?|Jt3*#jAu$}_+85q
x^|fc=^#{nZ&Ve_{>bTBIzbG1cStBw3D(5)CWxy4K%ZST_E4DM|_?$m}`ETc+p??4X

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

diff --git a/mainmem.s b/mainmem.s
index a95e9d0..0594958 100644
--- a/mainmem.s
+++ b/mainmem.s
@@ -813,27 +813,28 @@ CATALOGRET
 * Preprocess path in MOSFILE, handling '^' character
 * '^' means parent dir (eg: '^/SOMEDIR'))
 * Carry set on error, clear otherwise
-PREPATH     LDA   MOSFILE+1          ; First char of dirname
+PREPATH     JSR   GETPREF            ; Current pfx -> MOSFILE2
+:REENTER    LDA   MOSFILE+1          ; First char of dirname
             CMP   #$5E               ; '^' char
             BEQ   :CARET             ; If '^'
-            CMP   #$3A               ; ':' char
-            BEQ   :COLON
-            BRA   :EXIT              ; Nothing to do
-:CARET      JSR   GETPREF            ; Current prfx -> MOSFILE2
-            JSR   PARENT             ; Parent dir -> MOSFILE2
+            CMP   #$2F               ; '/' char - abs path
+            BEQ   :EXIT              ; Nothing to do
+            BRA   :PARENT
+:CARET      JSR   PARENT             ; Parent dir -> MOSFILE2
             JSR   DEL1CHAR           ; Delete '^' from MOSFILE
             LDA   MOSFILE            ; Is there more?
             BEQ   :PARENT            ; Only '^'
+            CMP   #$02               ; Len at least two?
+            BCC   :ERR               ; Nope!
             LDA   MOSFILE+1          ; What is next char?
             CMP   #$2F               ; Is it slash?
-            BNE   :ERR
+            BNE   :ERR               ; Nope!
+            JSR   DEL1CHAR           ; Delete '/' from MOSFILE
+            BRA   :REENTER           ; Go again!
 :PARENT     JSR   APPMF2             ; Append MOSFILE->MOSFILE2
             JSR   COPYMF2            ; Copy back to MOSFILE
 :EXIT       CLC
             RTS
-:COLON
-* TODO: Handle :SD for slot/drive here
-            BRA   :ERR
 :ERR        SEC
             RTS
 
@@ -900,8 +901,7 @@ PARENT      LDX   MOSFILE2           ; Length of string
             CPX   #$01
             BNE   :L1
             BRA   :EXIT              ; No slash found
-:FOUND      DEX
-            STX   MOSFILE2           ; Truncate string
+:FOUND      STX   MOSFILE2           ; Truncate string
 :EXIT       RTS
 
 * Convert slot/drive to prefix