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
Kernel/x86_64 - Bugfixing
[tpg/acess2.git]
/
Kernel
/
system.c
diff --git
a/Kernel/system.c
b/Kernel/system.c
index
9ff5fd9
..
a996038
100644
(file)
--- a/
Kernel/system.c
+++ b/
Kernel/system.c
@@
-23,7
+23,7
@@
typedef struct
} tConfigFile;
typedef struct
{
} tConfigFile;
typedef struct
{
- c
har
*Name; // Name
+ c
onst char
*Name; // Name
int MinArgs; // Minimum number of arguments
int MaxArgs; // Maximum number of arguments
Uint IntArgs; // Bitmap of arguments that should be treated as integers
int MinArgs; // Minimum number of arguments
int MaxArgs; // Maximum number of arguments
Uint IntArgs; // Bitmap of arguments that should be treated as integers
@@
-35,7
+35,7
@@
typedef struct
extern void Arch_LoadBootModules(void);
extern int Modules_LoadBuiltins(void);
extern void Modules_SetBuiltinParams(char *Name, char *ArgString);
extern void Arch_LoadBootModules(void);
extern int Modules_LoadBuiltins(void);
extern void Modules_SetBuiltinParams(char *Name, char *ArgString);
-extern void Debug_SetKTerminal(char *File);
+extern void Debug_SetKTerminal(c
onst c
har *File);
// === PROTOTYPES ===
void System_Init(char *Commandline);
// === PROTOTYPES ===
void System_Init(char *Commandline);
@@
-64,7
+64,7
@@
const tConfigCommand caConfigCommands[] = {
#define NUM_CONFIG_COMMANDS (sizeof(caConfigCommands)/sizeof(caConfigCommands[0]))
// === GLOBALS ===
#define NUM_CONFIG_COMMANDS (sizeof(caConfigCommands)/sizeof(caConfigCommands[0]))
// === GLOBALS ===
-c
har
*gsConfigScript = "/Acess/Conf/BootConf.cfg";
+c
onst char
*gsConfigScript = "/Acess/Conf/BootConf.cfg";
char *argv[32];
int argc;
char *argv[32];
int argc;
@@
-99,7
+99,8
@@
void System_ParseCommandLine(char *ArgString)
int i;
char *str;
int i;
char *str;
- Log_Log("Config", "Kernel Invocation \"%s\"", ArgString);
+ Log_Log("Config", "Kernel Invocation (%p) \"%s\"", ArgString, ArgString);
+ Log_Log("Config", "Kernel Invocation '0x%x 0x%x'", ArgString[0], ArgString[1]);
// --- Get Arguments ---
str = ArgString;
// --- Get Arguments ---
str = ArgString;
@@
-126,7
+127,7
@@
void System_ParseCommandLine(char *ArgString)
argc ++; // Count last argument
// --- Parse Arguments (Pass 1) ---
argc ++; // Count last argument
// --- Parse Arguments (Pass 1) ---
- for( i =
1
; i < argc; i++ )
+ for( i =
0
; i < argc; i++ )
{
switch(argv[i][0])
{
{
switch(argv[i][0])
{
@@
-152,8
+153,9
@@
void System_ParseCommandLine(char *ArgString)
void System_ExecuteCommandLine(void)
{
int i;
void System_ExecuteCommandLine(void)
{
int i;
- for( i =
1
; i < argc; i++ )
+ for( i =
0
; i < argc; i++ )
{
{
+ Log("argv[%i] = '%s'", i, argv[i]);
switch(argv[i][0])
{
// --- VFS ---
switch(argv[i][0])
{
// --- VFS ---
@@
-219,7
+221,8
@@
void System_ParseVFS(char *Arg)
}
/**
}
/**
- * \biref Parse a module argument string
+ * \brief Parse a module argument string
+ * \param Arg Argument string
*/
void System_ParseModuleArgs(char *Arg)
{
*/
void System_ParseModuleArgs(char *Arg)
{
@@
-545,6
+548,7
@@
tConfigFile *System_Int_ParseFile(char *FileData)
start = ptr;
ret->Lines[i].nParts = 0;
start = ptr;
ret->Lines[i].nParts = 0;
+ ret->Lines[i].Parts = NULL;
// Count parts
for(;;)
// Count parts
for(;;)
@@
-637,6
+641,12
@@
tConfigFile *System_Int_ParseFile(char *FileData)
}
}
}
}
+ if( i < ret->nLines ) {
+ ret->Lines[i].nParts = 0;
+ ret->Lines[i].Parts = NULL;
+ Log_Log("System", "Cleaning up final empty line");
+ }
+
LEAVE('p', ret);
return ret;
}
LEAVE('p', ret);
return ret;
}
UCC
git Repository :: git.ucc.asn.au