diff --git a/.A2osX Issue List.xlsx b/.A2osX Issue List.xlsx index d657d50c..374e40fb 100644 Binary files a/.A2osX Issue List.xlsx and b/.A2osX Issue List.xlsx differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 7209bedc..05742a20 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/SHELL.S.IO.txt b/BIN/SHELL.S.IO.txt index 3f62c713..5624c708 100644 --- a/BIN/SHELL.S.IO.txt +++ b/BIN/SHELL.S.IO.txt @@ -124,17 +124,19 @@ IO.PrintBatchErrMsg cmp #$0D beq .6 phy - >SYSCALL PutChar + >PUSHA + ldy #S.PS.hStdErr + lda (pPS),y + >SYSCALL fputc ply bra .5 -.6 lda #$0D - >SYSCALL PutChar - lda #$0A - >SYSCALL PutChar - - - +.6 >PUSHBI 0 + >PUSHW L.MSG.ECHOCRLF + ldy #S.PS.hStdErr + lda (pPS),y + >SYSCALL fprintf + lda ZPFileBufPtr sec sbc ZPPtr2 @@ -142,8 +144,10 @@ IO.PrintBatchErrMsg tay .7 phy - lda #'-' - >SYSCALL PutChar + >PUSHBI '-' + ldy #S.PS.hStdErr + lda (pPS),y + >SYSCALL fputc ply dey bne .7 @@ -151,8 +155,10 @@ IO.PrintBatchErrMsg .8 >PUSHW ZPPtr3 >PUSHBI 2 - >LDYA L.MSG.BATCHERR - >SYSCALL printf + >PUSHW L.MSG.BATCHERR + ldy #S.PS.hStdErr + lda (pPS),y + >SYSCALL fprintf rts *-------------------------------------- diff --git a/BIN/SHELL.S.txt b/BIN/SHELL.S.txt index 4e1231e9..3bc0dcd9 100644 --- a/BIN/SHELL.S.txt +++ b/BIN/SHELL.S.txt @@ -558,9 +558,9 @@ CS.END MSG.GREETINGS .AZ "\r\nA2osX-Shell %d.%d\r\n\r\n" MSG.PROMPT .AZ "\e[7h$ " MSG.TRACE .AS ">%s" -MSG.ECHOCRLF .AZ "\r\n" MSG.BATCHERR .AZ "^\r\nLine #%D:" -MSG.ERROR .AZ "[$%h]:%S.\r\n" +MSG.ERROR .AS "[$%h]:%S." +MSG.ECHOCRLF .AZ "\r\n" MSG.PRINTENV .AZ "%s = %s\r\n" MSG.PID .AZ "PID=%d\r\n" FMT.DATE .AZ "%A (%w), %B %d %Y"