From: John Hodge <tpg@mutabah.net>
Date: Sun, 22 Sep 2013 11:12:18 +0000 (+0800)
Subject: Usermode/init - Updated to new serial
X-Git-Tag: rel0.15~188
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=470e38ce75ff3e33390c78690faaa84f833b1cf3;p=tpg%2Facess2.git

Usermode/init - Updated to new serial
---

diff --git a/Usermode/Applications/init_src/main.c b/Usermode/Applications/init_src/main.c
index 1a609acf..ac1e8489 100644
--- a/Usermode/Applications/init_src/main.c
+++ b/Usermode/Applications/init_src/main.c
@@ -387,7 +387,7 @@ int AddSerialTerminal(const char *DevPathSegment, const char *ModeStr, char **Co
 	modeword |= (sbit - '0') << 3;
 	
 	// Create info
-	const char DEVPREFIX[] = "/Devices/";
+	const char DEVPREFIX[] = "/Devices/pts/serial";
 	int pathlen = sizeof(DEVPREFIX) + strlen(DevPathSegment);
 	tInitProgram	*ent = AllocateProgram(Command, PT_STERM, sizeof(struct sSTerm)+pathlen);
 	ent->TypeInfo.STerm.FormatBits = modeword;
@@ -413,6 +413,21 @@ int SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV)
 {
 	 int	handles[] = {c_stdin, c_stdout, c_stderr};
 
+	_SysDebug("Spawning '%s'", ArgV[0]);
+
+	if( c_stdin < 0 ) {
+		_SysDebug("SpawnCommand: stdin is invalid");
+		return 1;
+	}
+	if( c_stdout < 0 ) {
+		_SysDebug("SpawnCommand: stdout is invalid");
+		return 1;
+	}
+	if( c_stderr < 0 ) {
+		_SysDebug("SpawnCommand: stderr is invalid");
+		return 1;
+	}
+
 	int rv = _SysSpawn(ArgV[0], (const char **)ArgV, NULL, 3, handles, NULL);
 
 	_SysClose(c_stdin);
@@ -466,7 +481,8 @@ int SpawnDaemon(tInitProgram *Program)
 	 int	out = _SysOpen(Program->TypeInfo.Daemon.StdoutPath, OPENFLAG_WRITE);
 	 int	err = _SysOpen(Program->TypeInfo.Daemon.StderrPath, OPENFLAG_WRITE);
 	
-	if( in == -1 || out == -1 || err == -1 ) {
+	if( in < 0 || out < 0 || err < 0 ) {
+		perror("SpawnDaemon");
 		_SysClose(in);
 		_SysClose(out);
 		_SysClose(err);
@@ -476,8 +492,17 @@ int SpawnDaemon(tInitProgram *Program)
 	// Log spawn header
 	{
 		char	buffer[101];
-		size_t len = snprintf(buffer, 100, "[%i] init spawning '%s'\n", _SysTimestamp(), Program->Command);
+		size_t len = snprintf(buffer, 100, "[%lli] init spawning ", _SysTimestamp());
 		_SysWrite(out, buffer, len);
+		char ch = '\'';
+		for( int i = 0; Program->Command[i]; i ++ )
+		{
+			_SysWrite(out, &ch, 1);
+			_SysWrite(out, Program->Command[i], strlen(Program->Command[i]));
+			_SysWrite(out, &ch, 1);
+		}
+		ch = '\n';
+		_SysWrite(out, &ch, 1);
 	}
 	
 	return SpawnCommand(in, out, err, Program->Command);
diff --git a/Usermode/Filesystem/Conf/inittab b/Usermode/Filesystem/Conf/inittab
index 7b09b372..e752837b 100644
--- a/Usermode/Filesystem/Conf/inittab
+++ b/Usermode/Filesystem/Conf/inittab
@@ -5,6 +5,6 @@ daemon /Devices/null /Devices/null /Acess/SBin/telnetd
 
 ktty 0 /Acess/SBin/login
 ktty 1 /Acess/SBin/login
-stty serial/0 8N1b115200 /Acess/SBin/login
+stty 0 8N1b115200 /Acess/SBin/login
 
 # vim: ft=text