From d5cbc3f085f712cffe73733aeb8e29cb748e240f Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Wed, 15 Sep 2021 00:38:18 -0400
Subject: [PATCH] Some fixes to the file copy code (in progress)

---
 applecorn.po  | Bin 819200 -> 819200 bytes
 mainmem.svc.s |  27 ++++++++-------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index b2406b6791a95d7d95e518c32741d11cee0fd908..49b269b5390453c8e8c6c4172fce603a61762343 100644
GIT binary patch
delta 5592
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

delta 2354
zcmZo@FluNp+Mvq9sIgg%C5V|n%aB1|n~8y;;W2{(kTJQPeKw=wWMz)is)CLTD1hxR
z6C+4Kl0i>fg#oBsPuogtvM{Hns$c|)LI$?~5S5AyueDSd6d8aTM8zj3a%$EK2BNC`
z&&UimQ<OnY5o)HPI1__n0GcvpW@UyKP7F#6Mk*j>Km#p7$|6yfu{khHF#tV;>_VV2
z1{R<)Q7641|H+(Op3|8FS^jPoV3KEK<e%Os#2h(&fgQ5~P(XsQiLZ^1v5k+ZjgPsF
zk7XMltN5<%;#=5WGEO_i`fB^D9c+@q+aKR$?PT8GbDph2Y&**j)<2xf?Ae(X@i8ee
zv9PkSb8vET^YHTV3kd4y>ggL88X23InweWzT3OrJ+D&F;y0?s#O?H_Io5><Q6_Cbd
zTiBQ+?H!$*U0mJVJv_a<eSH1=0|JABLqfyCBY+y7Z`;nck%duw`=;G&etJOV7C>#x
Zqj)q7M$^D(8W>FjqiJ9?4bV0X008pV7Uuu}

diff --git a/mainmem.svc.s b/mainmem.svc.s
index e18cea3..0972538 100644
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@@ -156,36 +156,26 @@ COPY1FILE    STA   :DESTTYPE          ; TODO: USE THE DEST TYPE!!!!
              LDA   #$0A               ; Num parms back as we found it
              STA   GINFOPL
              BCS   :ERR               ; Error creating dest file
-             LDA   #$00               ; Look for empty slot
-             JSR   FINDBUF
-             STX   :BUFIDX
-             JSR   BUFADDR
-             BCS   :ERR               ; No I/O bufs available
-             STA   OPENPL+3
-             STY   OPENPL+4
              JSR   OPENFILE
              BCS   :ERR               ; Open error
              LDA   OPENPL+5           ; File ref num
              STA   READPL+1
-             LDX   :BUFIDX
-             STA   FILEREFS,X         ; Store file ref number
              LDA   #<MOSFILE2
-             STA   OPENPL+1
+             STA   OPENPL2+1
              LDA   #>MOSFILE2
-             STA   OPENPL+2
+             STA   OPENPL2+2
              LDA   #$00               ; Look for empty slot
              JSR   FINDBUF
-             STX   :BUFIDX
              JSR   BUFADDR
              BCS   :ERR               ; No I/O bufs available
-             STA   OPENPL+3
-             STY   OPENPL+4
-             JSR   OPENFILE
+             STA   OPENPL2+3
+             STY   OPENPL2+4
+             JSR   MLI
+             DB    OPENCMD
+             DW    OPENPL2
              BCS   :ERRCLS1
-             LDA   OPENPL+5           ; File ref num
+             LDA   OPENPL2+5           ; File ref num
              STA   WRITEPL+1
-             LDX   :BUFIDX
-             STA   FILEREFS,X         ; Store file ref number
              BRA   :MAINLOOP
 :ERR         SEC                      ; Report error
              RTS
@@ -218,7 +208,6 @@ COPY1FILE    STA   :DESTTYPE          ; TODO: USE THE DEST TYPE!!!!
              PHP
              BRA   :CLOSE2
 :DESTTYPE    DB    $00
-:BUFIDX      DB    $00
 
 * ProDOS file handling for MOS OSFIND OPEN call
 * Options in A: $40 'r', $80 'w', $C0 'rw'