// === CONSTANTS ===
#define DEFAULT_SHELL "/Acess/SBin/login"
-#define INITTAB_FILE "/Acess/Config/inittab"
+#define INITTAB_FILE "/Acess/Conf/inittab"
#define ARRAY_SIZE(x) ((sizeof(x))/(sizeof((x)[0])))
// No inittab file found, default to:
_SysDebug("inittab '%s' is invalid, falling back to one VT", gsInittabPath);
+ #if 1
for( ;; )
{
int pid = SpawnCommand(0, 1, 1, (char *[]){DEFAULT_SHELL, NULL});
+ // TODO: Detect errors
_SysWaitTID(pid, NULL);
}
- // TODO: Detect errors
+ #else
+ return 41;
+ #endif
}
// TODO: Implement message watching
for(;;)
{
int pid, status;
- pid = _SysWaitTID(0, &status);
+ pid = _SysWaitTID(-1, &status);
_SysDebug("PID %i died, looking for respawn entry", pid);
}
char *ReadQuotedString(FILE *FP)
{
char ch;
+
while( isblank(ch = fgetc(FP)) )
;
- if( ch == '\n' )
- return NULL;
+ if( ch == '\n' ) {
+ return NULL;
+ }
char *retstr = NULL;
int mode = 0;
}
else if( mode == 0 )
{
- if( isspace(ch) )
+ if( isspace(ch) ) {
+ fseek(FP, -1, SEEK_CUR);
break;
+ }
else if( ch == '\\' )
mode |= 4;
else if( ch == '"' )
space += 32;
void *tmp = realloc(retstr, space+1);
if( !tmp ) {
+ _SysDebug("ReadQuotedString - realloc(%i) failure", space+1);
free(retstr);
return NULL;
}
retstr[pos++] = ch;
}
}
- retstr[pos] = '\0';
+ if( retstr )
+ retstr[pos] = '\0';
return retstr;
}
char *arg;
do {
arg = ReadQuotedString(FP);
+ if(arg == NULL)
+ break;
if( pos == space - 1 ) {
+ _SysDebug("Too many arguments %i", pos);
ret[pos] = NULL;
FreeCommand(ret);
return NULL;
}
ret[pos++] = arg;
} while(arg != NULL);
+
+ if( pos == 0 )
+ {
+ free(ret);
+ return NULL;
+ }
ret[pos] = NULL;
return ret;
}
int ProcessInittab(const char *Path)
{
+ int line_num = 0;
FILE *fp = fopen(Path, "r");
if( !fp )
while(!feof(fp))
{
char cmdbuf[64+1];
- if( fscanf(fp, "%64s%*[ \t]", &cmdbuf) != 1 )
+
+ line_num ++;
+
+ int rv;
+ if( (rv = fscanf(fp, "%64s%*[ \t]", cmdbuf)) != 1 ) {
+ _SysDebug("fscanf rv %i != exp 1", rv);
break;
+ }
// Clear comments
if( cmdbuf[0] == '#' ) {
continue ;
}
if( cmdbuf[0] == '\0' ) {
- if( fgetc(fp) != '\n' ) {
+ char ch = fgetc(fp);
+ if( ch != '\n' && ch != -1 ) {
fclose(fp);
+ _SysDebug("Unexpected char 0x%x, expecting EOL", ch);
return 2; // Unexpected character?
}
continue ;
}
-
+
// Check commands
if( strcmp(cmdbuf, "ktty") == 0 ) {
// ktty <ID> <command...>
// - Spins off a console on the specified kernel TTY
int id = 0;
- if( fscanf(fp, "%d ", &id) != 1 )
+ if( fscanf(fp, "%d ", &id) != 1 ) {
+ _SysDebug("init[ktty] - TTY ID read failed");
goto lineError;
+ }
char **command = ReadCommand(fp);
- if( !command )
+ if( !command ) {
+ _SysDebug("init[ktty] - Command read failure");
goto lineError;
+ }
AddKTerminal(id, command);
- free(command);
}
else if(strcmp(cmdbuf, "stty") == 0 ) {
// stty <devpath> [78][NOE][012][bB]<baud> <command...>
char path_seg[32+1];
char modespec[4+6+1];
- if( fscanf(fp, "%32s %6s ", &path_seg, &modespec) != 2 ) {
+ if( fscanf(fp, "%32s %10s ", path_seg, modespec) != 2 ) {
goto lineError;
}
char **command = ReadCommand(fp);
// - Runs a daemon (respawning) that logs to the specified files
// - Will append a header whenever the daemon starts
char *stdout_path = ReadQuotedString(fp);
+ if( !stdout_path )
+ goto lineError;
char *stderr_path = ReadQuotedString(fp);
+ if( !stderr_path )
+ goto lineError;
char **command = ReadCommand(fp);
+ if( !command )
+ goto lineError;
AddDaemon(stdout_path, stderr_path, command);
}
if(!command)
goto lineError;
- int handles[] = {0, 1, 2};
+ int handles[] = {0, 1, 1};
int pid = _SysSpawn(command[0], (const char **)command, NULL, 3, handles, NULL);
- _SysWaitTID(pid, NULL);
+ int retstatus;
+ _SysWaitTID(pid, &retstatus);
+ _SysDebug("Command '%s' returned %i", command[0], retstatus);
FreeCommand(command);
}
else {
// Unknown command.
+ _SysDebug("Unknown command '%s'", cmdbuf);
+ goto lineError;
}
+ fscanf(fp, " ");
continue;
lineError:
+ _SysDebug("label lineError: goto'd - line %i, cmdbuf='%s'", line_num, cmdbuf);
while( !feof(fp) && fgetc(fp) != '\n' )
;
continue ;
}
fclose(fp);
+
+ if( gpInitPrograms == NULL )
+ return 2;
+
return 0;
}
int baud;
// Parse mode string
- if( sscanf(ModeStr, "%1[78]%1[NOE]%1[012]%*1[bB]%d", &dbit, &parity, &sbit, &baud) != 5 ) {
+ if( sscanf(ModeStr, "%1[78]%1[NOE]%1[012]%*1[bB]%d", &dbit, &parity, &sbit, &baud) != 4 ) {
// Oops?
+ _SysDebug("Serial mode string is invalid ('%s')", ModeStr);
return -1;
}
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;
{
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);
if( c_stdout != c_stdin )
_SysClose(c_stdout);
- if( c_stderr != c_stdin && c_stderr != c_stdin )
+ if( c_stderr != c_stdin && c_stderr != c_stdout )
_SysClose(c_stderr);
return rv;
int SpawnKTerm(tInitProgram *Program)
{
- const char fmt[] = "/Devices/VTerm/%i";
+ const char fmt[] = "/Devices/pts/vt%i";
char path[sizeof(fmt)];
snprintf(path, sizeof(path), fmt, Program->TypeInfo.KTerm.ID);
int in = _SysOpen(Program->TypeInfo.STerm.Path, OPENFLAG_READ);
int out = _SysOpen(Program->TypeInfo.STerm.Path, OPENFLAG_WRITE);
+ if(in == -1 || out == -1 ) {
+ _SysDebug("Unable to open serial port '%s'", Program->TypeInfo.STerm.Path);
+ return -1;
+ }
+
#if 0
if( _SysIOCtl(in, 0, NULL) != DRV_TYPE_SERIAL )
{
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);
return -2;
}
+ // Log spawn header
+ {
+ 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, Program->Command[i], strlen(Program->Command[i]));
+ _SysWrite(out, &ch, 1);
+ }
+ ch = '\n';
+ _SysWrite(out, &ch, 1);
+ }
+
return SpawnCommand(in, out, err, Program->Command);
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au