X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=stdio.asm;h=191e09893e2226146f1ee1d0b92a0650d66ec06d;hb=0b2424d77066d82aadd748ba74dc35eb81dde81b;hp=eeac43874b332fb92e81784c941da12be5169f4e;hpb=97a4e5ecb1623dbe0fbd7b6eeb96e966c6c5b1d3;p=rrq%2Frrqforth.git

diff --git a/stdio.asm b/stdio.asm
index eeac438..191e098 100644
--- a/stdio.asm
+++ b/stdio.asm
@@ -11,7 +11,7 @@
 	push qword 0		; address of mapping (suggestion)
 	push rax		; length of mapping
 	push qword 3		; protection mode PROT_READ | PROT_WRITE
-	push qword 8226		; flags PRIVATE | ANONYMOUS | LOCKED
+	push qword 34		; flags PRIVATE | ANONYMOUS 
 	push qword -1		; fd -1
 	push qword 0		; offset
 	jmp sys_mmap_asm	; exit via sys_mmap
@@ -214,7 +214,9 @@ p_read_word_nomore:
 
 	WORD p_double_quote,'"',fasm ;; " (fool emacs)
 	;; ( -- char* n )
-	;; Scan to double quote in stream buffer, putting the string on PAD
+	;; Scan to double quote in stream buffer, putting the string
+	;; on PAD, plus an extra NUL, then copy that into a new temp
+	;; object, but exclude the NUL from the returned count, n.
 	pushr rsi
 	push p_pad_DFA
 	push 0
@@ -232,6 +234,14 @@ p_double_quote_loop:
 	jmp p_double_quote_loop
 p_double_quote_endquote:
 p_double_quote_endstream:
+	lea rdi,[p_pad_DFA]
+	add rdi,qword [rsp]
+	stosb
+	;; copy PAD string into new temp object
+	inc qword [rsp]
+	DOFORTH p_str2temp
+	dec qword [rsp]
+	add qword [rsp+8],8 	; adjust pointer
 	popr rsi
 	next