From 35a8b8b2a0b2b9c529f9bf72de9edc694e1bfd93 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 21 Aug 2021 20:13:06 -0400
Subject: [PATCH] Implemented OSFILE A=&06: Delete file, *DELETE cmd

---
 applecorn.po    | Bin 819200 -> 819200 bytes
 auxmem.hostfs.s |  12 +++++++-----
 auxmem.oscli.s  |  36 +++++++++++++++++++++++++++++++-----
 mainmem.s       |  20 +++++++++++++-------
 4 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 2e305337311b45b467d2556841b3ab6f73c7179c..f6ee554df38d5620ee35c1e8ad2dd53e97d70a86 100644
GIT binary patch
delta 3929
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
LCS7o;E+qATxOq@8

delta 3588
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
Ns3U4~7e0D0^FO^~T{{2(

diff --git a/auxmem.hostfs.s b/auxmem.hostfs.s
index 0fb2885..48a8ddd 100644
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@@ -227,10 +227,11 @@ FILEHND     PHX
 
             PLA                       ; Get action back
             PHA
-            BEQ   :S1                 ; A=00 -> SAVE
+            BEQ   :SAVE               ; A=00 -> SAVE
             CMP   #$FF
-            BEQ   :S2                 ; A=FF -> LOAD
-
+            BEQ   :LOAD               ; A=FF -> LOAD
+            CMP   #$06
+            BEQ   :DELETE             ; A=06 -> DELET
             LDA   #<OSFILEM           ; If not implemented, print msg
             LDY   #>OSFILEM
             JSR   PRSTR
@@ -244,8 +245,9 @@ FILEHND     PHX
             PLY
             PLX
             RTS
-:S1         >>>   XF2MAIN,SAVEFILE
-:S2         >>>   XF2MAIN,LOADFILE
+:SAVE       >>>   XF2MAIN,SAVEFILE
+:LOAD       >>>   XF2MAIN,LOADFILE
+:DELETE     >>>   XF2MAIN,DELFILE
 OSFILERET
             >>>   ENTAUX
             PHA
diff --git a/auxmem.oscli.s b/auxmem.oscli.s
index fbe36fc..d8d3fcb 100644
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@@ -64,7 +64,7 @@ CLIHND      PHX
             JSR   STRCMP
             BCS   :S5
             JSR   STARLOAD
-            BRA   :EXIT
+            BRA   :IEXIT
 :S5         LDA   #<:SAVE
             STA   ZP2
             LDA   #>:SAVE
@@ -81,7 +81,15 @@ CLIHND      PHX
             BCS   :S7
             JSR   STARRUN
             BRA   :EXIT
-:S7         LDA   #<:HELP
+:S7         LDA   #<:DELETE
+            STA   ZP2
+            LDA   #>:DELETE
+            STA   ZP2+1
+            JSR   STRCMP
+            BCS   :S8
+            JSR   STARDEL
+            BRA   :EXIT
+:S8         LDA   #<:HELP
             STA   ZP2
             LDA   #>:HELP
             STA   ZP2+1
@@ -91,9 +99,6 @@ CLIHND      PHX
             BRA   :EXIT
 :ASKROM     LDA   $8006         ; Check for service entry
             BPL   :UNSUPP       ; No service entry
-*            LDA   $8003     ; Check for service entry
-*            CMP   #$4C      ; Not a JMP?
-*            BNE   :UNSUPP   ; Only BASIC has no srvc entry
             LDA   ZP1           ; String in (OSLPTR),Y
             STA   OSLPTR
             LDA   ZP1+1
@@ -142,6 +147,8 @@ CLIHND      PHX
             DB    $00
 :RUN        ASC   'RUN'
             DB    $00
+:DELETE     ASC   'DELETE'
+            DB    $00
 :HELP       ASC   'HELP'
             DB    $00
 :OSCLIM     ASC   'OSCLI('
@@ -399,6 +406,25 @@ JUMPFSCV    PHA
             PLA
 CALLFSCV    JMP   (FSCV)        ; Hand on to filing system
 
+* Handle *DELETE command
+* On entry, ZP1 points to command line
+STARDEL     JSR   EATSPC        ; Eat leading space
+            JSR   ADDZP1Y       ; Advance ZP1
+            LDA   ZP1
+            STA   OSFILECB+0
+            LDA   ZP1+1
+            STA   OSFILECB+1
+            JSR   EATWORD
+            LDA   #$0D
+            STA   (ZP1),Y       ; Terminate filename
+            LDX   #<OSFILECB
+            LDY   #>OSFILECB
+            LDA   #$06          ; OSFILE delete command
+            JSR   OSFILE
+            RTS
+:ERR        JSR   BEEP
+            RTS
+
 * Clear OSFILE control block to zeros
 CLRCB       LDA   #$00
             LDX   #$00
diff --git a/mainmem.s b/mainmem.s
index d47f4d4..4a63ece 100644
--- a/mainmem.s
+++ b/mainmem.s
@@ -139,21 +139,27 @@ COPYAUXBLK
             CLI
             RTS
 
-* ProDOS file handling for MOS OSFIND OPEN call
-* Options in A: $40 'r', $80 'w', $C0 'rw'
-OFILE       >>>   ENTMAIN
-            PHA                      ; Preserve arg for later
-            CMP   #$80               ; Write mode
-            BNE   :S0
+* ProDOS file handling to delete a file
+DELFILE     >>>   ENTMAIN
+            JSR   DESTROY
+            >>>   XF2AUX,OSFILERET
 
-            LDA   #<MOSFILE          ; Attempt to destroy file
+DESTROY     LDA   #<MOSFILE          ; Attempt to destroy file
             STA   DESTPL+1
             LDA   #>MOSFILE
             STA   DESTPL+2
             JSR   MLI
             DB    DESTCMD
             DW    DESTPL
+            RTS
 
+* ProDOS file handling for MOS OSFIND OPEN call
+* Options in A: $40 'r', $80 'w', $C0 'rw'
+OFILE       >>>   ENTMAIN
+            PHA                      ; Preserve arg for later
+            CMP   #$80               ; Write mode
+            BNE   :S0
+            JSR   DESTROY
             LDA   #<MOSFILE          ; Attempt to create file
             STA   CREATEPL+1
             STA   OPENPL+1