X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libsrc%2Fatari%2Fopen.s;h=2188257cb17d8f404d1131516cbaadf220d5cce0;hb=2c19ec4753b9ec349bb514498fce0a66becb644c;hp=d39a4050e482659eb13797ec9e5aeb97d2dd58b9;hpb=62d883157afbe61e20c897ba1b84e13aa86217d7;p=cc65

diff --git a/libsrc/atari/open.s b/libsrc/atari/open.s
index d39a4050e..2188257cb 100644
--- a/libsrc/atari/open.s
+++ b/libsrc/atari/open.s
@@ -1,210 +1,176 @@
 ;
-; Christian Groessler, May-2000
+; Christian Groessler, Jan-2003
 ;
 ; int open(const char *name,int flags,...);
 ;
 
-UCASE_FILENAME	= 1		; comment it out if filename shouldn't be uppercased
-
-	.include "atari.inc"
-	.include "../common/fmode.inc"
-	.include "../common/errno.inc"
-	.export	_open
-	.import	fddecusage,newfd
-	.import	__do_oserror,__seterrno,incsp4
-	.import	ldaxysp,addysp,subysp
-	.import	_strupr,__oserror
-	.importzp tmp4,tmp2,sp
-.ifdef	UCASE_FILENAME
-	.importzp tmp3,ptr4
+        .include "atari.inc"
+        .include "fcntl.inc"
+        .include "errno.inc"
+        .include "fd.inc"
+
+        .export _open
+        .destructor     closeallfiles, 5
+
+        .import _close
+        .import clriocb
+        .import fddecusage,newfd
+        .import findfreeiocb
+        .import incsp4
+        .import ldaxysp,addysp
+        .import __oserror
+        .importzp tmp4,tmp2
+.ifdef  UCASE_FILENAME
+        .importzp tmp3
+        .import ucase_fn
 .endif
 
-.proc	_open
-
-	cpy	#4		; correct # of arguments (bytes)?
-	beq	parmok		; parameter count ok
-	tya			; parm count < 4 shouldn't be needed to be checked
-	sec			;	(it generates a c compiler warning)
-	sbc	#4
-	tay
-	jsr	addysp		; fix stack, throw away unused parameters
-
-parmok:	jsr	findfreeiocb
-	beq	iocbok		; we found one
-
-	lda	#<EMFILE	; "too many open files"
-	ldx	#>EMFILE
-seterr:	jsr	__seterrno
-	jsr	incsp4		; clean up stack
-	lda	#$FF
-	tax
-	rts			; return -1
-
-	; process the mode argument
-	; @@@TODO: append not handled yet!
-
-iocbok:	stx	tmp4
-	jsr	clriocb		; init with zero
-	ldy	#1
-	jsr	ldaxysp		; get mode
-	ldx	tmp4
-	cmp	#O_RDONLY
-	bne	l1
-	lda	#OPNIN
-set:	sta	ICAX1,x
-	bne	cont
-
-l1:	cmp	#O_WRONLY
-	bne	l2
-	lda	#OPNOT
-	bne	set
-
-l2:	; O_RDWR
-	lda	#OPNOT|OPNIN
-	bne	set
-
-	; process the filename argument
-
-cont:	ldy	#3
-	jsr	ldaxysp
-
-.ifdef	UCASE_FILENAME
-	; we make sure that the filename doesn't contain lowercase letters
-	; we copy the filename we got onto the stack, uppercase it and use this
-	; one to open the iocb
-	; we're using tmp3, ptr4
-
-	; save the original pointer
-	sta	ptr4
-	stx	ptr4+1
-
-	; now we need the length of the name
-	ldy	#0
-loop:	lda	(ptr4),y
-	beq	str_end
-	cmp	#ATEOL		; we also accept Atari EOF char as end of string
-	beq	str_end
-	iny
-	bne	loop		; not longer than 255 chars (127 real limit)
-toolong:lda	#<EINVAL	; file name is too long
-	ldx	#>EINVAL
-	jmp	seterr
-
-str_end:iny			; room for terminating zero
-	cpy	#128		; we only can handle lenght < 128
-	bcs	toolong
-	sty	tmp3		; save size
-	jsr	subysp		; make room on the stack
-
-	; copy filename to the temp. place on the stack
-	lda	#0		; end-of-string
-	sta	(sp),y		; Y still contains length + 1
-	dey
-loop2:	lda	(ptr4),y
-	sta	(sp),y
-	dey
-	bpl	loop2		; bpl: this way we only support a max. length of 127
-
-	; uppercase the temp. filename
-	ldx	sp+1
-	lda	sp
-	jsr	_strupr
-
-	; leave X and Y pointing to the modified filename
-	lda	sp
-	ldx	sp+1
-
-.endif	; defined UCASE_FILENAME
-
-	ldy	tmp4
-
-	;AX - points to filename
-	;Y  - iocb to use, if open needed
-	jsr	newfd		; maybe we don't need to open and can reuse an iocb
-				; returns fd num to use in tmp2, all regs unchanged
-	bcs	doopen		; C set: open needed
-	lda	#0		; clears N flag
-	beq	finish
-
-doopen:	sta	ICBAL,y
-	txa
-	sta	ICBAH,y
-	ldx	tmp4
-	lda	#OPEN
-	sta	ICCOM,x
-	jsr	CIOV
-
-	; clean up the stack
-
-finish:	php
-	txa
-	pha
-	tya
-	pha
-
-.ifdef	UCASE_FILENAME
-	ldy	tmp3		; get size
-	jsr	addysp		; free used space on the stack
-.endif	; defined UCASE_FILENAME
-
-	jsr	incsp4		; clean up stack
-
-	pla
-	tay
-	pla
-	tax
-	plp
-
-	bpl	ok
-	jsr	fddecusage	; decrement usage counter of fd as open failed
-	jmp	__do_oserror
-
-ok:	lda	tmp2		; get fd
-	ldx	#0
-	stx	__oserror
-	rts
+.proc   _open
+
+        dey                     ; parm count < 4 shouldn't be needed to be checked
+        dey                     ;       (it generates a c compiler warning)
+        dey
+        dey
+        beq     parmok          ; parameter count ok
+        jsr     addysp          ; fix stack, throw away unused parameters
+
+parmok: jsr     findfreeiocb
+        beq     iocbok          ; we found one
+
+        lda     #<EMFILE        ; "too many open files"
+seterr: jsr     __directerrno
+        jsr     incsp4          ; clean up stack
+        lda     #$FF
+        tax
+        rts                     ; return -1
+
+        ; process the mode argument
+
+iocbok: stx     tmp4
+        jsr     clriocb         ; init with zero
+        ldy     #1
+        jsr     ldaxysp         ; get mode
+        ldx     tmp4
+        pha
+        and     #O_APPEND
+        beq     no_app
+        pla
+        and     #15
+        cmp     #O_RDONLY       ; DOS supports append with write-only only
+        beq     invret
+        cmp     #O_RDWR
+        beq     invret
+        lda     #OPNOT|APPEND
+        bne     set
+
+.ifndef UCASE_FILENAME
+invret: lda     #<EINVAL        ; file name is too long
+        jmp     seterr
+.endif
 
-.endproc
+no_app: pla
+        and     #15
+        cmp     #O_RDONLY
+        bne     l1
+        lda     #OPNIN
+set:    sta     ICAX1,x
+        bne     cont
+
+l1:     cmp     #O_WRONLY
+        bne     l2
+        lda     #OPNOT
+        bne     set
 
+l2:     ; O_RDWR
+        lda     #OPNOT|OPNIN
+        bne     set
 
-; find a free iocb
-; no entry parameters
-; return ZF = 0/1 for not found/found
-;        index in X if found
-; all registers destroyed
-
-.proc	findfreeiocb
-
-	ldx	#0
-	ldy	#$FF
-loop:	tya
-	cmp	ICHID,x
-	beq	found
-	txa
-	clc
-	adc	#$10
-	tax
-	cmp	#$80
-	bcc	loop
-	inx			; return ZF cleared
-found:	rts
+        ; process the filename argument
+
+cont:   ldy     #3
+        jsr     ldaxysp
+
+.ifdef  UCASE_FILENAME
+.ifdef  DEFAULT_DEVICE
+        ldy     #$80
+        sty     tmp2            ; set flag for ucase_fn
+.endif
+        jsr     ucase_fn
+        bcc     ucok1
+invret: lda     #<EINVAL        ; file name is too long
+        jmp     seterr
+ucok1:
+
+.endif  ; defined UCASE_FILENAME
+
+        ldy     tmp4
+
+        ;AX - points to filename
+        ;Y  - iocb to use, if open needed
+        jsr     newfd           ; maybe we don't need to open and can reuse an iocb
+                                ; returns fd num to use in tmp2, all regs unchanged
+        bcs     doopen          ; C set: open needed
+        lda     #0              ; clears N flag
+        beq     finish
+
+doopen: sta     ICBAL,y
+        txa
+        sta     ICBAH,y
+        ldx     tmp4
+        lda     #OPEN
+        sta     ICCOM,x
+        jsr     CIOV
+
+        ; clean up the stack
+
+finish: php
+        txa
+        pha
+        tya
+        pha
+
+.ifdef  UCASE_FILENAME
+        ldy     tmp3            ; get size
+        jsr     addysp          ; free used space on the stack
+.endif  ; defined UCASE_FILENAME
+
+        jsr     incsp4          ; clean up stack
+
+        pla
+        tay
+        pla
+        tax
+        plp
+
+        bpl     ok
+        sty     tmp3            ; remember error code
+        lda     #CLOSE
+        sta     ICCOM,x
+        jsr     CIOV            ; close IOCB again since open failed
+        jsr     fddecusage      ; and decrement usage counter of fd
+        lda     tmp3            ; put error code into A
+        jmp     __mappederrno
+
+ok:     lda     tmp2            ; get fd
+        ldx     #0
+        stx     __oserror
+        rts
 
 .endproc
 
 
-; clear iocb except for ICHID field
-; expects X to be index to IOCB (0,$10,$20,etc.)
-; all registers destroyed
+; closeallfiles: Close all files opened by the program.
 
-.proc	clriocb
+.proc   closeallfiles
 
-	inx			; don't clear ICHID
-	ldy	#15
-	lda	#0
-loop:	sta	ICHID,x
-	dey
-	inx
-	bne	loop
-	rts
+        lda     #MAX_FD_INDEX-1
+loop:   ldx     #0
+        pha
+        jsr     _close
+        pla
+        clc
+        sbc     #0
+        bpl     loop
+        rts
 
 .endproc