Usermode/init - Better logging

[tpg/acess2.git] / Usermode / Applications / init_src / main.c

diff --git a/Usermode/Applications/init_src/main.c b/Usermode/Applications/init_src/main.c
index ff34796..e9c3ef9 100644 (file)
--- a/Usermode/Applications/init_src/main.c
+++ b/Usermode/Applications/init_src/main.c
@@ -27,7 +27,7 @@ void  RespawnProgam(tInitProgram *Program);
  int   AddSerialTerminal(const char *DevPathSegment, const char *ModeStr, char **Command);
  int   AddDaemon(char *StdoutPath, char *StderrPath, char **Command);
 
- int   SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV);
+ int   SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV, const char **EnvP);
  int   SpawnKTerm(tInitProgram *Program);
  int   SpawnSTerm(tInitProgram *Program);
  int   SpawnDaemon(tInitProgram *Program);
@@ -57,7 +57,9 @@ int main(int argc, char *argv[])
                #if 1
                for( ;; )
                {
-                       int pid = SpawnCommand(0, 1, 1, (char *[]){DEFAULT_SHELL, NULL});
+                       char *args[] = {DEFAULT_SHELL, NULL};
+                       const char *env[] = {"TERM=screen", NULL};
+                       int pid = SpawnCommand(0, 1, 1, args, env);
                        // TODO: Detect errors
                        _SysWaitTID(pid, NULL);
                }
@@ -387,7 +389,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;
@@ -409,11 +411,26 @@ int AddDaemon(char *StdoutPath, char *StderrPath, char **Command)
        return 0;
 }
 
-int SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV)
+int SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV, const char **EnvP)
 {
         int    handles[] = {c_stdin, c_stdout, c_stderr};
 
-       int rv = _SysSpawn(ArgV[0], (const char **)ArgV, NULL, 3, handles, NULL);
+       _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, EnvP, 3, handles, NULL);
 
        _SysClose(c_stdin);
        if( c_stdout != c_stdin )
@@ -426,7 +443,8 @@ int SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV)
 
 int SpawnKTerm(tInitProgram *Program)
 {
-       const char fmt[] = "/Devices/pts/vt%ic";
+       const char fmt[] = "/Devices/pts/vt%i";
+       const char *env[] = {"TERM=screen", NULL};
        char    path[sizeof(fmt)];
        
        snprintf(path, sizeof(path), fmt, Program->TypeInfo.KTerm.ID);
@@ -434,7 +452,9 @@ int SpawnKTerm(tInitProgram *Program)
         int    in = _SysOpen(path, OPENFLAG_READ);
         int    out = _SysOpen(path, OPENFLAG_WRITE);
        
-       return SpawnCommand(in, out, out, Program->Command);
+       _SysDebug("Spawning virtual terminal '%s' with term '%s'",
+               path, Program->Command[0]);
+       return SpawnCommand(in, out, out, Program->Command, env);
 }
 
 int SpawnSTerm(tInitProgram *Program)
@@ -457,7 +477,9 @@ int SpawnSTerm(tInitProgram *Program)
        _SysIOCtl(in, SERIAL_IOCTL_GETSETFORMAT, &Program->TypeInfo.STerm.FormatBits);
        #endif
 
-       return SpawnCommand(in, out, out, Program->Command);
+       _SysDebug("Spawning serial terminal '%s' with term '%s'",
+               Program->TypeInfo.STerm.Path, Program->Command[0]);
+       return SpawnCommand(in, out, out, Program->Command, NULL);
 }
 
 int SpawnDaemon(tInitProgram *Program)
@@ -466,7 +488,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,10 +499,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);
+               for( int i = 0; Program->Command[i]; i ++ )
+               {
+                       _SysWrite(out, "'", 1);
+                       _SysWrite(out, Program->Command[i], strlen(Program->Command[i]));
+                       _SysWrite(out, "'", 1);
+               }
+               _SysWrite(out, "\n", 1);
        }
        
-       return SpawnCommand(in, out, err, Program->Command);
+       return SpawnCommand(in, out, err, Program->Command, NULL);
 }