From: izydorst <izydorst@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 1 May 2003 16:18:04 +0000 (+0000)
Subject: GetFile fixes
X-Git-Tag: V2.12.0~1608
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c87ddefa006f1dd0634374e37db5e35ea9cec280;p=cc65

GetFile fixes


git-svn-id: svn://svn.cc65.org/cc65/trunk@2104 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/doc/geos.sgml b/doc/geos.sgml
index 4c7b76cf5..a49b4d88d 100644
--- a/doc/geos.sgml
+++ b/doc/geos.sgml
@@ -890,16 +890,16 @@ starting track and sector which may point either to start of a chain for VLIR or
 
 <sect3>GetFile
 <p>
-<tt/char __fastcall__ GetFile(char saveflag, char loadflag, const char *fname, const char *loadaddr, const char *datadname, char *datafname)/
+<tt/char __fastcall__ GetFile(char flag, const char *fname, const char *loadaddr, const char *datadname, const char *datafname)/
 <p>
 This routine loads and runs a given file <tt/fname/. The file must be one of following types:
 <tt/SYSTEM, DESK_ACC, APPLICATION, APPL_DATA, PRINTER,/ or <tt/INPUT_DEVICE/. The execution
-address is taken from file header. It is zero, then file is only loaded. Only the first chain
-from VLIR files is loaded. If <tt/loadflag/ has bit 0 set then load address is taken from <tt/loadaddr/
+address is taken from file header. If it is zero, then file is only loaded. Only the first chain
+from VLIR files is loaded. If <tt/flag/ has bit 0 set then load address is taken from <tt/loadaddr/
 and not from file header. In this case <tt/APPLICATION/ files will be only loaded, not executed.
-This does not apply to <tt/DESK_ACC/. If either bit 6 or 7 of <tt/loadflag/ are set, then 16 bytes from
+This does not apply to <tt/DESK_ACC/. If either bit 6 or 7 of <tt/flag/ are set, then 16 bytes from
 <tt/datadname/ is copied to <tt/dataDiskName/ and 16 bytes from <tt/datafname/ goes to <tt/dataFileName/
-in system case. If you don't use it it is safe to pass <tt/NULL/ to this function.
+thus becoming parameters for the new application. Pass <tt/NULL/ as any unused parameter.
 
 
 <sect3>ReadFile
diff --git a/include/geos/gfile.h b/include/geos/gfile.h
index 75a606c51..2d80d0b37 100644
--- a/include/geos/gfile.h
+++ b/include/geos/gfile.h
@@ -17,8 +17,8 @@ struct filehandle *__fastcall__ GetNxtDirEntry(void);
 
 char __fastcall__ FindFTypes(char *buffer, char ftype, char fmaxnum, const char *classtxt);
 
-char __fastcall__ GetFile(char saveflag, char loadflag, const char *fname,
-                          const char *loadaddr, const char *datadname, char *datafname);
+char __fastcall__ GetFile(char flag, const char *fname,
+                          const char *loadaddr, const char *datadname, const char *datafname);
 char __fastcall__ FindFile(const char *fname);
 char __fastcall__ ReadFile(struct tr_se *myTrSe, char *buffer, unsigned flength);
 char __fastcall__ SaveFile(char skip, struct fileheader *myHeader);
diff --git a/libsrc/geos/file/getfile.s b/libsrc/geos/file/getfile.s
index 82ae9e043..336ef2411 100644
--- a/libsrc/geos/file/getfile.s
+++ b/libsrc/geos/file/getfile.s
@@ -4,7 +4,7 @@
 ;
 ; 4.4.2003
 
-; char __fastcall__ GetFile(char saveflag, char loadflag, const char *fname, const char *loadaddr, const char *datadname, char *datafname);
+; char __fastcall__ GetFile(char flag, const char *fname, const char *loadaddr, const char *datadname, char *datafname);
 
 	    .export _GetFile
 	    .import popa, popax, setoserror
@@ -26,7 +26,7 @@ _GetFile:
 	stx r6H
 	jsr popa
 	sta r0L
-	jsr popa
+	lda #0
 	sta r10L
 	jsr GetFile
 	jmp setoserror