System_ExecuteCommandLine();
// - Execute the Config Script
- Log_Log("Config", "Executing config script...");
+ Log_Log("Config", "Executing config script '%s'", gsConfigScript);
System_ExecuteScript();
// Set the debug to be echoed to the terminal
// Get length
VFS_Seek(fp, 0, SEEK_END);
fLen = VFS_Tell(fp);
+ Log_Debug("System", "VFS_Tell(%i) = %i", fp, fLen);
VFS_Seek(fp, 0, SEEK_SET);
// Read into memory buffer
fData = malloc(fLen+1);
if(line->Parts[0][0] == ':') continue; // Ignore labels
// Prescan and eliminate variables
- for( j = 1; j < line->nParts; j++ ) {
+ for( j = 1; j < line->nParts; j++ )
+ {
Log_Debug("Config", "Arg #%i is '%s'", j, line->Parts[j]);
bReplaced[j] = 0;
if( line->Parts[j][0] != '$' ) continue;
bReplaced[j] = 1;
}
+ // Find the command name
for( j = 0; j < NUM_CONFIG_COMMANDS; j++ )
{
Uint args[N_MAX_ARGS];
+
if(strcmp(line->Parts[0], caConfigCommands[j].Name) != 0) continue;
Log_Debug("Config", "Command '%s', %i args passed", line->Parts[0], line->nParts-1);
+ // Check against minimum argument count
if( line->nParts - 1 < caConfigCommands[j].MinArgs ) {
Log_Warning("Config",
"Configuration command '%s' requires at least %i arguments, %i given",
break;
}
+ // Check for extra arguments
if( line->nParts - 1 > caConfigCommands[j].MaxArgs ) {
Log_Warning("Config",
"Configuration command '%s' takes at most %i arguments, %i given",
break;
}
+ // Fill in defaults
for( k = caConfigCommands[j].MaxArgs-1; k > line->nParts - 1; k-- ) {
args[k] = caConfigCommands[j].OptDefaults[k];
}
+ // Convert arguments to integers
for( k = line->nParts-1; k--; )
{
if( caConfigCommands[j].IntArgs & (1 << k) ) {
start = ptr;
ret->Lines[i].nParts = 0;
+ ret->Lines[i].Parts = NULL;
// Count parts
for(;;)
}
}
+ 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;
}