Integrate wildcards into commands that use them.

This commit is contained in:
Bobbi Webber-Manners 2021-09-09 14:58:44 -04:00
parent 2ceebae7c1
commit 980376bf71
2 changed files with 5 additions and 10 deletions

Binary file not shown.

View File

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