From b14b8ee71a8096fe39dac440acd0adadc44f82f1 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Thu, 9 Sep 2021 19:55:27 -0400
Subject: [PATCH] Further refactoring.

---
 applecorn.po   | Bin 819200 -> 819200 bytes
 mainmem.svc.s  |  20 +++++++++++++++-----
 mainmem.wild.s |   6 ++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 5251d1f088728439098d1e7a50f136fce5f0e97d..daaf94252ce500067fec424a9cb6b3bd52d3e425 100644
GIT binary patch
delta 2388
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
BxdZ?J

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

diff --git a/mainmem.svc.s b/mainmem.svc.s
index cfa4fdf..64f3a7a 100644
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@@ -730,8 +730,9 @@ DRVINFO      >>>   ENTMAIN
 * Filename in MOSFILE, flags in MOSFILE2
 SETPERM      >>>   ENTMAIN
              JSR   PREPATH            ; Preprocess pathname
-             JSR   WILDONE            ; Handle any wildcards
-             BCS   :ERR
+             BCS   :SYNERR
+             JSR   WILDCARD           ; Handle any wildcards
+             BCS   :NONE
              STZ   :LFLAG
              STZ   :WFLAG
              STZ   :RFLAG
@@ -739,7 +740,7 @@ SETPERM      >>>   ENTMAIN
              INX
 :L1          DEX
              CPX   #$00
-             BEQ   :DONEARG
+             BEQ   :MAINLOOP
              LDA   MOSFILE2,X         ; Read arg2 char
              CMP   #'L'               ; L=Locked
              BNE   :S1
@@ -753,7 +754,12 @@ SETPERM      >>>   ENTMAIN
              BNE   :ERR2              ; Bad attribute
              STA   :WFLAG
              BRA   :L1
-:DONEARG     LDA   #<MOSFILE
+:SYNERR      LDA   #$40               ; Invalid pathname syn
+             BRA   :EXIT
+:NONE        JSR   CLSDIR
+             LDA   #$40               ; TODO PROPER ERROR CODE
+             BRA   :EXIT
+:MAINLOOP    LDA   #<MOSFILE
              STA   GINFOPL+1
              LDA   #>MOSFILE
              STA   GINFOPL+2
@@ -773,8 +779,12 @@ SETPERM      >>>   ENTMAIN
              AND   #$3D               ; Turn off destroy/ren/write
 :S5          STA   GINFOPL+3          ; Access byte
              JSR   SETINFO            ; SET_FILE_INFO
+             JSR   WILDNEXT
+             BCS   :NOMORE
+             BRA   :MAINLOOP
 :EXIT        >>>   XF2AUX,ACCRET
-:ERR         LDA   #$40               ; Invalid pathname syn
+:NOMORE      JSR   CLSDIR
+             LDA   #$00
              BRA   :EXIT
 :ERR2        LDA   #$53               ; Invalid parameter
              BRA   :EXIT
diff --git a/mainmem.wild.s b/mainmem.wild.s
index bde0ff5..dcdb5ee 100644
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@@ -47,6 +47,12 @@ WILDCARD    STZ   :LAST
             RTS
 :LAST       DB    $00          ; Flag for last segment
 
+* Obtain subsequent wildcard matches
+* WILDCARD must have been called first
+* Returns with carry set if wildcard match fails, clear otherwise
+WILDNEXT    SEC                ; Just say 'no match' for now
+            RTS
+
 * Copy a segment of the path into SEGBUF
 * PREPATH makes all paths absolute, so always begins with '/'
 * On entry: X contains index of first char in MOSFILE to process