ATRONIX: posix stdio related changes as were made by Andreas Bolka and Hostile Fork

Author: Oldes

src/os/host-main.c

@@ -85,7 +85,7 @@ extern void Init_Ext_Test(void);	// see: host-ext-test.c
 // Host bare-bones stdio functs:
 extern void Open_StdIO(void);
 extern void Close_StdIO(void);
-extern void Put_Str(char *buf);
+extern void Put_Str(REBYTE *buf);
 extern REBYTE *Get_Str();
 
 void Host_Crash(REBYTE *reason) {

src/os/posix/dev-stdio.c

@@ -46,43 +46,39 @@
 #include <string.h>
 
 #include "reb-host.h"
-#include "host-lib.h"
-
-#define BUF_SIZE (16*1024)
 
 #define SF_DEV_NULL 31		// local flag to mark NULL device
 
 // Temporary globals: (either move or remove?!)
-static int Std_Inp = 0;
-static int Std_Out = 1;
-static FILE *Std_Echo = 0;
-
-static REBOOL Redir_Out = 0; // redirection flags
-static REBOOL Redir_Inp = 0;
-
-#define PUTE(s)		if (Std_Echo) fputs(s, Std_Echo)
+static int Std_Inp = STDIN_FILENO;
+static int Std_Out = STDOUT_FILENO;
+static FILE *Std_Echo = NULL;
 
 extern REBDEV *Devices[];
+extern void Put_Str(REBYTE *buf);
 
 #ifndef HAS_SMART_CONSOLE	// console line-editing and recall needed
-void *Init_Terminal();
-void Quit_Terminal(void*);
-int  Read_Line(void*, char*, int);
+typedef struct term_data {
+	char *buffer;
+	char *residue;
+	char *out;
+	int pos;
+	int end;
+	int hist;
+} STD_TERM;
+
+STD_TERM *Term_IO;
+
+extern STD_TERM *Init_Terminal();
+extern void Quit_Terminal(STD_TERM*);
+extern int  Read_Line(STD_TERM*, char*, int);
 #endif
 
-void Put_Str(char *buf);
-
-void *Term_IO;
-
-/*
-#define	PUTS(s)		fputs(s, stdout)
-#define GETS(s,len)	fgets(s, len, stdin);
-#define FLUSH()		fflush(stdout)
-*/
 
 static void Handle_Signal(int sig)
 {
-	Put_Str("[escape]\n");
+	REBYTE buf[] = "\x1B[1;35;49m[escape]\x1B[0m\n";
+	Put_Str(buf);
 	RL_Escape(0);
 }
 
@@ -93,7 +89,7 @@ static void Init_Signals(void)
 	signal(SIGTERM, Handle_Signal);
 }
 
-static void close_stdio(void)
+static void Close_Stdio(void)
 {
 #ifndef HAS_SMART_CONSOLE
 	if (Term_IO) {
@@ -115,7 +111,7 @@ static void close_stdio(void)
 {
 	REBDEV *dev = (REBDEV*)dr; // just to keep compiler happy above
 
-	close_stdio();
+	Close_Stdio();
 
 	CLR_FLAG(dev->flags, RDF_OPEN);
 	return DR_DONE;
@@ -148,9 +144,7 @@ static void close_stdio(void)
 #ifndef HAS_SMART_CONSOLE
 		if (isatty(Std_Inp))
 			Term_IO = Init_Terminal();
-		else
 #endif
-			Term_IO = 0;
 		//printf("%x\r\n", req->handle);
 	}
 	else
@@ -171,9 +165,9 @@ static void close_stdio(void)
 {
 	REBDEV *dev = Devices[req->device];
 
-	close_stdio();
+	Close_Stdio();
 
-	CLR_FLAG(req->flags, RRF_OPEN);
+	CLR_FLAG(dev->flags, RRF_OPEN);
 
 	return DR_DONE;
 }