X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Finit_src%2Fmain.c;h=4d66654c4923354cc1b0787b287f0b8ced33fbbb;hb=11686aa86bc0adae2555aa7796fe229770bb02f7;hp=e701b44e4a2a262063ef3f6a34e82650242e3cc1;hpb=17e16b3110b4c5124b0707435e0427993d696545;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/init_src/main.c b/Usermode/Applications/init_src/main.c
index e701b44e..4d66654c 100644
--- a/Usermode/Applications/init_src/main.c
+++ b/Usermode/Applications/init_src/main.c
@@ -2,30 +2,109 @@
  * Acess2 System Init Task
  */
 #include <acess/sys.h>
+#include <stdlib.h>
+#include <stdio.h>
+//#include <spiderscript.h>
+//#include "common.h"
 
 // === CONSTANTS ===
-#define NULL	((void*)0)
+#define NUM_TERMS	4
 #define	DEFAULT_TERMINAL	"/Devices/VTerm/0"
-#define DEFAULT_SHELL	"/Acess/CLIShell"
+#define DEFAULT_SHELL	"/Acess/SBin/login"
+#define DEFAULT_SCRIPT	"/Acess/Conf/BootConf.isc"
+
+#define ARRAY_SIZE(x)	((sizeof(x))/(sizeof((x)[0])))
+
+// === PROTOTYPES ===
+/*
+tSpiderVariable	*Script_System_IO_Open(tSpiderScript *, int, tSpiderVariable *);
+*/
+
+// === GLOBALS ===
+/*
+tSpiderFunction	gaScriptNS_IO_Fcns[] = {
+	{"Open", Script_System_IO_Open}
+};
+tSpiderNamespace	gaScriptNS_System[] = {
+	{
+		"IO",
+		0, NULL,
+		ARRAY_SIZE(gaScriptNS_IO_Fcns), gaScriptNS_IO_Fcns,
+		0, NULL
+	}
+};
+
+tSpiderNamespace	gaScriptNamespaces[] = {
+	{
+		"System",
+		ARRAY_SIZE(gaScriptNS_System), gaScriptNS_System,
+		0, NULL,
+		0, NULL
+	}
+};
+
+tSpiderVariant	gScriptVariant = {
+	"init", 0,
+	ARRAY_SIZE(gaScriptNamespaces), gaScriptNamespaces
+};
+*/
 
 // === CODE ===
 /**
  * \fn int main(int argc, char *argv[])
+ * \brief Entrypoint
  */
 int main(int argc, char *argv[])
 {
-	open(DEFAULT_TERMINAL, OPENFLAG_READ);	// Stdin
-	open(DEFAULT_TERMINAL, OPENFLAG_WRITE);	// Stdout
-	open(DEFAULT_TERMINAL, OPENFLAG_WRITE);	// Stderr
+	 int	tid;
+	 int	i;
+	char	termpath[sizeof(DEFAULT_TERMINAL)] = DEFAULT_TERMINAL;
+	char	*child_argv[2] = {DEFAULT_SHELL, 0};
 	
-	write(1, 13, "Hello, World!");
+	// - Parse init script
 	
-	if(clone(CLONE_VM, 0) == 0)
-	{
-		execve(DEFAULT_SHELL, NULL, NULL);
+	// - Start virtual terminals
+	for( i = 0; i < NUM_TERMS; i++ )
+	{		
+		tid = clone(CLONE_VM, 0);
+		if(tid == 0)
+		{
+			termpath[sizeof(DEFAULT_TERMINAL)-2] = '0' + i;
+			
+			open(termpath, OPENFLAG_READ);	// Stdin
+			open(termpath, OPENFLAG_WRITE);	// Stdout
+			open(termpath, OPENFLAG_WRITE);	// Stderr
+			execve(DEFAULT_SHELL, child_argv, NULL);
+			for(;;)	sleep();
+		}
 	}
 	
+	// TODO: Implement message watching
 	for(;;)	sleep();
 	
 	return 42;
 }
+
+/**
+ * \brief Reads and parses the boot configuration script
+ * \param Filename	File to parse and execute
+ */
+void ExecuteScript(const char *Filename)
+{
+	/*
+	tSpiderScript	*script;
+	script = SpiderScript_ParseFile(&gScriptVariant, Filename);
+	SpiderScript_ExecuteMethod(script, "");
+	SpiderScript_Free(script);
+	*/
+}
+
+/**
+ * \brief Open a file
+ */
+/*
+tSpiderVariable	*Script_System_IO_Open(tSpiderScript *Script, int NArgs, tSpiderVariable *Args)
+{
+	return NULL;
+}
+*/