git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/GUI Terminal - Fixed some characters not triggering end of normal text
[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
a3d737d
..
1a609ac
100644
(file)
--- a/
Usermode/Applications/init_src/main.c
+++ b/
Usermode/Applications/init_src/main.c
@@
-54,7
+54,7
@@
int main(int argc, char *argv[])
// No inittab file found, default to:
_SysDebug("inittab '%s' is invalid, falling back to one VT", gsInittabPath);
// No inittab file found, default to:
_SysDebug("inittab '%s' is invalid, falling back to one VT", gsInittabPath);
- #if
0
+ #if
1
for( ;; )
{
int pid = SpawnCommand(0, 1, 1, (char *[]){DEFAULT_SHELL, NULL});
for( ;; )
{
int pid = SpawnCommand(0, 1, 1, (char *[]){DEFAULT_SHELL, NULL});
@@
-157,7
+157,8
@@
char *ReadQuotedString(FILE *FP)
retstr[pos++] = ch;
}
}
retstr[pos++] = ch;
}
}
- retstr[pos] = '\0';
+ if( retstr )
+ retstr[pos] = '\0';
return retstr;
}
return retstr;
}
@@
-179,6
+180,12
@@
char **ReadCommand(FILE *FP)
}
ret[pos++] = arg;
} while(arg != NULL);
}
ret[pos++] = arg;
} while(arg != NULL);
+
+ if( pos == 0 )
+ {
+ free(ret);
+ return NULL;
+ }
ret[pos] = NULL;
return ret;
}
ret[pos] = NULL;
return ret;
}
@@
-196,6
+203,7
@@
void FreeCommand(char **Command)
int ProcessInittab(const char *Path)
{
int ProcessInittab(const char *Path)
{
+ int line_num = 0;
FILE *fp = fopen(Path, "r");
if( !fp )
FILE *fp = fopen(Path, "r");
if( !fp )
@@
-205,8
+213,10
@@
int ProcessInittab(const char *Path)
{
char cmdbuf[64+1];
{
char cmdbuf[64+1];
+ line_num ++;
+
int rv;
int rv;
- if( (rv = fscanf(fp, "%64s%*[ \t]",
&
cmdbuf)) != 1 ) {
+ if( (rv = fscanf(fp, "%64s%*[ \t]", cmdbuf)) != 1 ) {
_SysDebug("fscanf rv %i != exp 1", rv);
break;
}
_SysDebug("fscanf rv %i != exp 1", rv);
break;
}
@@
-242,13
+252,12
@@
int ProcessInittab(const char *Path)
goto lineError;
}
AddKTerminal(id, command);
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];
}
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);
goto lineError;
}
char **command = ReadCommand(fp);
@@
-261,8
+270,14
@@
int ProcessInittab(const char *Path)
// - Runs a daemon (respawning) that logs to the specified files
// - Will append a header whenever the daemon starts
char *stdout_path = ReadQuotedString(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);
char *stderr_path = ReadQuotedString(fp);
+ if( !stderr_path )
+ goto lineError;
char **command = ReadCommand(fp);
char **command = ReadCommand(fp);
+ if( !command )
+ goto lineError;
AddDaemon(stdout_path, stderr_path, command);
}
AddDaemon(stdout_path, stderr_path, command);
}
@@
-274,7
+289,7
@@
int ProcessInittab(const char *Path)
if(!command)
goto lineError;
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);
int retstatus;
_SysWaitTID(pid, &retstatus);
int pid = _SysSpawn(command[0], (const char **)command, NULL, 3, handles, NULL);
int retstatus;
_SysWaitTID(pid, &retstatus);
@@
-290,13
+305,17
@@
int ProcessInittab(const char *Path)
fscanf(fp, " ");
continue;
lineError:
fscanf(fp, " ");
continue;
lineError:
- _SysDebug("label lineError: goto'd
"
);
+ _SysDebug("label lineError: goto'd
- line %i, cmdbuf='%s'", line_num, cmdbuf
);
while( !feof(fp) && fgetc(fp) != '\n' )
;
continue ;
}
fclose(fp);
while( !feof(fp) && fgetc(fp) != '\n' )
;
continue ;
}
fclose(fp);
+
+ if( gpInitPrograms == NULL )
+ return 2;
+
return 0;
}
return 0;
}
@@
-354,8
+373,9
@@
int AddSerialTerminal(const char *DevPathSegment, const char *ModeStr, char **Co
int baud;
// Parse mode string
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?
// Oops?
+ _SysDebug("Serial mode string is invalid ('%s')", ModeStr);
return -1;
}
return -1;
}
@@
-406,7
+426,7
@@
int SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV)
int SpawnKTerm(tInitProgram *Program)
{
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);
char path[sizeof(fmt)];
snprintf(path, sizeof(path), fmt, Program->TypeInfo.KTerm.ID);
@@
-422,6
+442,11
@@
int SpawnSTerm(tInitProgram *Program)
int in = _SysOpen(Program->TypeInfo.STerm.Path, OPENFLAG_READ);
int out = _SysOpen(Program->TypeInfo.STerm.Path, OPENFLAG_WRITE);
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 )
{
#if 0
if( _SysIOCtl(in, 0, NULL) != DRV_TYPE_SERIAL )
{
@@
-448,6
+473,13
@@
int SpawnDaemon(tInitProgram *Program)
return -2;
}
return -2;
}
+ // Log spawn header
+ {
+ char buffer[101];
+ size_t len = snprintf(buffer, 100, "[%i] init spawning '%s'\n", _SysTimestamp(), Program->Command);
+ _SysWrite(out, buffer, len);
+ }
+
return SpawnCommand(in, out, err, Program->Command);
}
return SpawnCommand(in, out, err, Program->Command);
}
UCC
git Repository :: git.ucc.asn.au