From 71c0b8c149b518a506a99b2896fafe836bc1e002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Thu, 3 Nov 2016 17:26:02 +0100
Subject: [PATCH] Kernel version 0.8 : BUGFIX #10 ...more advanced ECHO command

---
 SBIN/SHELL.S.CMD.txt | 29 ++++++++++++++++-------------
 SBIN/SHELL.S.ERR.txt |  2 +-
 SBIN/SHELL.S.TXT.txt |  2 +-
 SBIN/SHELL.S.txt     |  6 ++----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/SBIN/SHELL.S.CMD.txt b/SBIN/SHELL.S.CMD.txt
index a789f813..b183da07 100644
--- a/SBIN/SHELL.S.CMD.txt
+++ b/SBIN/SHELL.S.CMD.txt
@@ -186,10 +186,11 @@ Cmd.Exec.CD		lda ARGS
 Cmd.Exec.PWD	ldy #S.PS.hPREFIX
 				lda (pPs),y
 				>SYSCALL GetMemPtrA
-				>PUSHYA
-				>LDYA L.MSG.PSTR
-				>SYSCALL PrintFYA
-				rts
+				>SYSCALL PPrintFYA
+				bcs .9
+				lda #13
+				>SYSCALL COutA
+.9				rts
 				
 Cmd.Exec.CD1	stz UsrBuf256
 				lda ARGS+1
@@ -336,7 +337,7 @@ Cmd.Exec.SET	lda ARGS
 				>PUSHW ZPPTR1			Push name
 
 				>LDYA L.MSG.PRINTENV
-				>SYSCALL PrintFYA
+				>SYSCALL CPrintFYA
 				bcs .9
 
 				lda ZPPTR2
@@ -384,7 +385,7 @@ Cmd.Exec.SETVAR	tax
 				>PUSHYA					push value
 				>PUSHW L.ARGS			push name
 				>LDYA L.MSG.PRINTENV
-				>SYSCALL PrintFYA
+				>SYSCALL CPrintFYA
 				
 .8				clc
 .9				rts
@@ -411,16 +412,18 @@ Cmd.Exec.TIME	clc
 .2				>PUSHW L.TIME
 				>SYSCALL PStrFTime
 				
-				>PUSHWI UsrBuf256
-				>LDYA L.MSG.PSTR
-				>SYSCALL PrintFYA
-				rts
+				>LDYAI UsrBuf256
+				bcs .9
+				lda #13
+				>SYSCALL COutA
+.9				rts
 *--------------------------------------
 Cmd.Exec.ECHO	lda ARGS
 				beq Cmd.Exec.ECHO.SYN
-				>PUSHW L.ARGS
-				>LDYA L.MSG.PSTR
-				>SYSCALL PrintFYA
+				
+				
+				>LDYA L.ARGS
+				>SYSCALL PPrintFYA
 				clc
 				rts
 				
diff --git a/SBIN/SHELL.S.ERR.txt b/SBIN/SHELL.S.ERR.txt
index 33f2ec2b..47c8546e 100644
--- a/SBIN/SHELL.S.ERR.txt
+++ b/SBIN/SHELL.S.ERR.txt
@@ -43,7 +43,7 @@ ERR.Print		>PUSHA					Save EC for PrintF
 				
 .8				>PUSHW ZPPTR1
 				>LDYA L.MSG.ERROR
-				>SYSCALL PrintFYA
+				>SYSCALL CPrintFYA
 				rts
 *--------------------------------------
 MAN
diff --git a/SBIN/SHELL.S.TXT.txt b/SBIN/SHELL.S.TXT.txt
index 9893487d..f119f869 100644
--- a/SBIN/SHELL.S.TXT.txt
+++ b/SBIN/SHELL.S.TXT.txt
@@ -51,7 +51,7 @@ TXT.ReadFile	>PUSHWI UsrBuf256+1
 
 				>PUSHW pData
 				>LDYA L.MSG.ECHO
-				>SYSCALL PrintFYA
+				>SYSCALL CPrintFYA
 .8				clc
 .9				rts
 *--------------------------------------
diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt
index eaa3794c..e734a427 100644
--- a/SBIN/SHELL.S.txt
+++ b/SBIN/SHELL.S.txt
@@ -41,7 +41,6 @@ L.MSG.GREETINGS	.DA MSG.GREETINGS
 L.MSG.PROMPT	.DA MSG.PROMPT
 L.MSG.ECHO		.DA MSG.ECHO
 L.MSG.ERROR		.DA MSG.ERROR
-L.MSG.PSTR		.DA MSG.PSTR
 L.MSG.PRINTENV	.DA MSG.PRINTENV
 L.ENV.PATH		.DA ENV.PATH
 L.ENV.PWD		.DA ENV.PWD
@@ -93,7 +92,7 @@ CS.INIT.INTERACTIVE
 				lda (pPs),y
 				>PUSHA
 				>LDYA L.MSG.GREETINGS
-				>SYSCALL PrintFYA
+				>SYSCALL CPrintFYA
 				
 				lda (pPs)
 				ora #S.PS.F.EVENT		Now accept events
@@ -353,7 +352,7 @@ PrintPrompt		>LDYA L.ENV.PS1
 				pla
 				>SYSCALL FreeMemA
 				>LDYA L.MSG.PROMPT
-				>SYSCALL PrintFYA
+				>SYSCALL CPrintFYA
 .9				rts
 *--------------------------------------
 * Remove extra SPACE & comment
@@ -460,7 +459,6 @@ MSG.ECHO		>CSTR ">%S\n"
 MSG.ERROR		>CSTR "%S ($%h)\n"
 FMT.DATE		>PSTR "%A, %B %d %Y"
 FMT.TIME		>PSTR "%H:%M:%S (%I:%M:%S%p)"
-MSG.PSTR		>CSTR "%S\n"
 MSG.PRINTENV	>CSTR "%S=%S\n"
 *--------------------------------------
 				.INB X.ERRORS.S