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);
#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);
}
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};
return 1;
}
- int rv = _SysSpawn(ArgV[0], (const char **)ArgV, NULL, 3, handles, NULL);
+ int rv = _SysSpawn(ArgV[0], (const char **)ArgV, EnvP, 3, handles, NULL);
_SysClose(c_stdin);
if( c_stdout != c_stdin )
int SpawnKTerm(tInitProgram *Program)
{
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);
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)
_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)
char buffer[101];
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, "'", 1);
_SysWrite(out, Program->Command[i], strlen(Program->Command[i]));
- _SysWrite(out, &ch, 1);
+ _SysWrite(out, "'", 1);
}
- ch = '\n';
- _SysWrite(out, &ch, 1);
+ _SysWrite(out, "\n", 1);
}
- return SpawnCommand(in, out, err, Program->Command);
+ return SpawnCommand(in, out, err, Program->Command, NULL);
}