From 980376bf7150e9ac795f333da0f72bb290a80cbc Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Thu, 9 Sep 2021 14:58:44 -0400
Subject: [PATCH] Integrate wildcards into commands that use them.

---
 applecorn.po  | Bin 819200 -> 819200 bytes
 mainmem.svc.s |  15 +++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index e59bf7dbc44e1de71d8301a4aab761cc4cb29e6f..7e460973b3f5c9bdbaf928656ccfc103070c514c 100644
GIT binary patch
delta 2988
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

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

diff --git a/mainmem.svc.s b/mainmem.svc.s
index efb36cc..7eb1b81 100644
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@@ -91,6 +91,7 @@ RENFILE      >>>   ENTMAIN
 OFILE        >>>   ENTMAIN
              PHA                      ; Preserve arg for later
              JSR   PREPATH            ; Preprocess pathname
+             JSR   WILDCARD           ; Handle any wildcards
              JSR   EXISTS             ; See if file exists ...
              CMP   #$02               ; ... and is a directory
              BNE   :NOTDIR
@@ -306,6 +307,7 @@ TELL         >>>   ENTMAIN
 *        A>$1F ProDOS error, translated by FILERET
 LOADFILE     >>>   ENTMAIN
              JSR   PREPATH            ; Preprocess pathname
+             JSR   WILDCARD           ; Handle any wildcards
              JSR   EXISTS             ; See if it exists ...
              CMP   #$01               ; ... and is a file
              BEQ   :ISFILE
@@ -642,6 +644,7 @@ CATALOG      >>>   ENTMAIN
              LDA   MOSFILE            ; Length of pathname
              BEQ   :NOPATH            ; If zero use prefix
              JSR   PREPATH            ; Preprocess pathname
+             JSR   WILDCARD           ; Handle any wildcards
              JSR   EXISTS             ; See if path exists ...
              CMP   #$01               ; ... and is a file
              BNE   :NOTFILE
@@ -684,7 +687,7 @@ CATALOGRET
 * Set prefix. Used by *CHDIR to change directory
 SETPFX       >>>   ENTMAIN
              JSR   PREPATH            ; Preprocess pathname
-             JSR   WILDCARD           ; EXPERIMENTAL
+             JSR   WILDCARD           ; Handle any wildcards
              BCS   :ERR
              LDA   #<MOSFILE
              STA   SPFXPL+1
@@ -727,6 +730,7 @@ DRVINFO      >>>   ENTMAIN
 * Filename in MOSFILE, flags in MOSFILE2
 SETPERM      >>>   ENTMAIN
              JSR   PREPATH            ; Preprocess pathname
+             JSR   WILDCARD           ; Handle any wildcards
              BCS   :ERR
              STZ   :LFLAG
              STZ   :WFLAG
@@ -794,12 +798,3 @@ MAINRDMEM    STA   A1L
              LDA   (A1L)
 MAINRDEXIT   >>>   XF2AUX,NULLRTS     ; Back to an RTS
 
-
-
-
-
-
-
-
-
-