mainargs rewrite by Oliver Schmidt
git-svn-id: svn://svn.cc65.org/cc65/trunk@3453 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
parent
c81dc42f93
commit
1c5c974200
2 changed files with 82 additions and 93 deletions
|
|
@ -20,7 +20,7 @@
|
|||
; ProDOS 8 2.0.3 - $23
|
||||
;
|
||||
|
||||
.constructor initdostype
|
||||
.constructor initdostype, 25
|
||||
.export __dos_type
|
||||
|
||||
.include "mli.inc"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
; Based on code from Stefan A. Haubenthal <polluks@web.de>, 2003-11-08
|
||||
; Greg King, 2003-05-18
|
||||
; Stefan Haubenthal, 2005-01-07
|
||||
; Oliver Schmidt, 2005-04-05
|
||||
;
|
||||
; Scan a group of arguments that are in BASIC's input-buffer.
|
||||
; Build an array that points to the beginning of each argument.
|
||||
|
|
@ -19,30 +20,23 @@
|
|||
; spaces outside of quotes are ignored.
|
||||
|
||||
; TO-DO:
|
||||
; - The "file-name" might be a path-name; don't copy the directory-components.
|
||||
; - Add a control-character quoting mechanism.
|
||||
; Add a control-character quoting mechanism.
|
||||
|
||||
.constructor initmainargs, 24
|
||||
.import __argc, __argv
|
||||
.import __argc, __argv, __dos_type
|
||||
|
||||
.include "zeropage.inc"
|
||||
.include "apple2.inc"
|
||||
|
||||
; Maximum number of arguments allowed in the argument table.
|
||||
; (An argument contains a comma, at least.)
|
||||
;
|
||||
|
||||
MAXARGS = 10
|
||||
|
||||
BASIC_BUF = $200
|
||||
BASIC_BUF_LEN = 239
|
||||
FNAM_LEN = $280
|
||||
FNAM = $281
|
||||
|
||||
MAXARGS = 10 ; Maximum number of arguments allowed
|
||||
REM = $B2 ; BASIC token-code
|
||||
NAME_LEN = 15 ; maximum length of command-name
|
||||
|
||||
; Validate sizes
|
||||
.if MAXARGS > (BASIC_BUF_LEN - 2)/2
|
||||
.error "Too many arguments"
|
||||
.endif
|
||||
|
||||
; Get possible command-line arguments. Goes into the special INIT segment,
|
||||
; which may be reused after the startup code is run
|
||||
|
|
@ -51,30 +45,29 @@ NAME_LEN = 15 ; maximum length of command-name
|
|||
|
||||
initmainargs:
|
||||
|
||||
; Assume that the program was loaded, a moment ago, by the traditional LOAD
|
||||
; statement. Save the "most-recent filename" as argument #0.
|
||||
; Because the buffer, that we're copying into, was zeroed out,
|
||||
; we don't need to add a NUL character.
|
||||
;
|
||||
ldy FNAM_LEN
|
||||
cpy #NAME_LEN + 1
|
||||
bcc L1
|
||||
ldy #NAME_LEN - 1 ; limit the length
|
||||
L0: lda FNAM,y
|
||||
sta name,y
|
||||
L1: dey
|
||||
bpl L0
|
||||
; Assume that the program was loaded, a moment ago, by the traditional BLOAD
|
||||
; statement of BASIC.SYSTEM. Save the "most-recent filename" as argument #0.
|
||||
|
||||
ldx __dos_type ; No ProDOS -> argv[0] = ""
|
||||
beq :+
|
||||
|
||||
; Terminate the filename with a zero to make it a valid C string.
|
||||
|
||||
ldx FNAM_LEN
|
||||
: lda #$00
|
||||
sta FNAM,x
|
||||
|
||||
inc __argc ; argc always is equal to, at least, 1
|
||||
|
||||
; Find the "rem" token.
|
||||
|
||||
ldx #0
|
||||
L2: lda BASIC_BUF,x
|
||||
beq done ; no "rem" no args.
|
||||
ldx #$00
|
||||
: lda BASIC_BUF,x
|
||||
beq done ; No "rem" -> no args
|
||||
inx
|
||||
cmp #REM
|
||||
bne L2
|
||||
ldy #1 * 2
|
||||
bne :-
|
||||
ldy #$01 * 2 ; Start with argv[1]
|
||||
|
||||
; Find the next argument.
|
||||
|
||||
|
|
@ -82,18 +75,18 @@ next: lda BASIC_BUF,x
|
|||
beq done
|
||||
inx
|
||||
cmp #' ' ; Skip leading spaces
|
||||
beq next ;
|
||||
beq next
|
||||
|
||||
; Found start of next argument. We've incremented the pointer in X already, so
|
||||
; it points to the second character of the argument. This is useful since we
|
||||
; will check now for a quoted argument, in which case we will have to skip this
|
||||
; first character.
|
||||
|
||||
found: cmp #'"' ; Is the argument quoted?
|
||||
cmp #'"' ; Is the argument quoted?
|
||||
beq setterm ; Jump if so
|
||||
dex ; Reset pointer to first argument character
|
||||
lda #' ' ; A space ends the argument
|
||||
setterm:sta term ; Set end of argument marker
|
||||
setterm:sta tmp1 ; Set end of argument marker
|
||||
|
||||
; Now store a pointer to the argument into the next slot. Since the BASIC
|
||||
; input buffer is located at the start of a RAM page, no calculations are
|
||||
|
|
@ -112,14 +105,14 @@ setterm:sta term ; Set end of argument marker
|
|||
argloop:lda BASIC_BUF,x
|
||||
beq done
|
||||
inx
|
||||
cmp term
|
||||
cmp tmp1
|
||||
bne argloop
|
||||
|
||||
; We've found the end of the argument. X points one character behind it, and
|
||||
; A contains the terminating character. To make the argument a valid C string,
|
||||
; replace the terminating character by a zero.
|
||||
|
||||
lda #0
|
||||
lda #$00
|
||||
sta BASIC_BUF-1,x
|
||||
|
||||
; Check if the maximum number of command line arguments is reached. If not,
|
||||
|
|
@ -137,14 +130,10 @@ done: lda #<argv
|
|||
stx __argv+1
|
||||
rts
|
||||
|
||||
; These arrays are zeroed before initmainargs is called.
|
||||
; char name[NAME_LEN+1];
|
||||
; char* argv[MAXARGS+1]={name};
|
||||
|
||||
.bss
|
||||
term: .res 1
|
||||
name: .res NAME_LEN + 1
|
||||
; This array is zeroed before initmainargs is called.
|
||||
; char* argv[MAXARGS+1] = {FNAM};
|
||||
|
||||
.data
|
||||
argv: .addr name
|
||||
|
||||
argv: .addr FNAM
|
||||
.res MAXARGS * 2
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue