From 80772913368f6a4ebf70b8f35073d5d881784fb8 Mon Sep 17 00:00:00 2001
From: Anatoliy Belyanskiy <tolik.trek@gmail.com>
Date: Wed, 25 Oct 2023 02:50:02 +1000
Subject: [PATCH] [x] 25/10/23

---
 DSS/build.txt        |  2 +-
 SHELL/SHELL.ASM      | 13 ++++++-------
 SHELL/SHELL_EXEC.ASM | 19 ++++++++++++++++---
 SHELL/build.txt      |  2 +-
 Shared_Includes      |  2 +-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/DSS/build.txt b/DSS/build.txt
index 9889789..0316458 100644
--- a/DSS/build.txt
+++ b/DSS/build.txt
@@ -1 +1 @@
-499
\ No newline at end of file
+503
\ No newline at end of file
diff --git a/SHELL/SHELL.ASM b/SHELL/SHELL.ASM
index b66cd26..cfe8a7e 100644
--- a/SHELL/SHELL.ASM
+++ b/SHELL/SHELL.ASM
@@ -334,13 +334,12 @@ restore_path:
 
 
 ; на новую строку	;!FIXIT сделать через .PChars
-newline:ld	a,_cc.cr
-	ld	c,Dss.PutChar
-	RST	ToDSS
-	ld	a,_cc.lf
-	ld	c,Dss.PutChar
-	RST	ToDSS
-	ret
+newline:	ld	a,_cc.cr
+		ld	c,Dss.PutChar
+		rst	ToDSS
+		ld	a,_cc.lf
+		ld	c,Dss.PutChar
+		jp	ToDSS
 
 
 ; Сравнение строк
diff --git a/SHELL/SHELL_EXEC.ASM b/SHELL/SHELL_EXEC.ASM
index 0d6bcdb..6fcd0a2 100644
--- a/SHELL/SHELL_EXEC.ASM
+++ b/SHELL/SHELL_EXEC.ASM
@@ -154,7 +154,9 @@ A839D:	ld	bc,0*256 + Dss.Exec	; 
         ;R10
         CALL    Restore_Screen
         ;R10	
-	ret	nc			; Ok
+	;[x] 25/10/23
+	 JP	NC,Ret_New_Line		; Ok
+	;
 	ld	hl,(D8374)
 	cp	DSS_Error.sys.FILE_NOT_FOUND
 	jr	nz,A83DD
@@ -196,10 +198,21 @@ A83B7:	ld	e,b
 A83D7:	ld	bc,0*256 + Dss.Exec	; загрузить программу, выполнить файл
 	RST	ToDSS
         ;R10
-        CALL    Restore_Screen
+         CALL    Restore_Screen
         ;R10
-	ret	nc
+	;
+	;[x] 25/10/23
+	 JP	NC,Ret_New_Line	; Ok
+	;
 A83DD:	cp	DSS_Error.sys.INVALID_HANDLE	; код ошибки "нет дескриптора"
 	jp	nc,print_err_message		; вывод сообщения
 	xor	a				; индекс "Bad command or file name"
 	jp	print_err_message
+
+Ret_New_Line:
+	LD	C,Dss.Cursor
+	RST	ToDSS
+	XOR	A
+	OR	E
+	RET	Z
+	jp	newline
\ No newline at end of file
diff --git a/SHELL/build.txt b/SHELL/build.txt
index 615be70..9f72858 100644
--- a/SHELL/build.txt
+++ b/SHELL/build.txt
@@ -1 +1 @@
-85
\ No newline at end of file
+88
\ No newline at end of file
diff --git a/Shared_Includes b/Shared_Includes
index 9319bb7..3744776 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 9319bb78d96af2573dd54d8d2f422f2f134b5653
+Subproject commit 374477690571809e7318bd4279bc7da120b6c492