X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsystem.c;h=a99603849c6b9187bd21447e391f60d97d1c8eeb;hb=df1d534cfe822903fc38e1cc13c4b18941c91908;hp=da1dc92f07c063a6b9d48debe87090c0e2121736;hpb=05e8b329edc7c55eec967c3caba1982c173025e3;p=tpg%2Facess2.git

diff --git a/Kernel/system.c b/Kernel/system.c
index da1dc92f..a9960384 100644
--- a/Kernel/system.c
+++ b/Kernel/system.c
@@ -23,7 +23,7 @@ typedef struct
 }	tConfigFile;
 typedef struct
 {
-	char	*Name;		// Name
+	const 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
@@ -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	Debug_SetKTerminal(char *File);
+extern void	Debug_SetKTerminal(const char *File);
 
 // === PROTOTYPES ===
 void	System_Init(char *Commandline);
@@ -64,7 +64,7 @@ const tConfigCommand	caConfigCommands[] = {
 #define NUM_CONFIG_COMMANDS	(sizeof(caConfigCommands)/sizeof(caConfigCommands[0]))
 
 // === GLOBALS ===
-char	*gsConfigScript = "/Acess/Conf/BootConf.cfg";
+const char	*gsConfigScript = "/Acess/Conf/BootConf.cfg";
 char	*argv[32];
  int	argc;
 
@@ -548,6 +548,7 @@ tConfigFile	*System_Int_ParseFile(char *FileData)
 		start = ptr;
 		
 		ret->Lines[i].nParts = 0;
+		ret->Lines[i].Parts = NULL;
 		
 		// Count parts
 		for(;;)
@@ -640,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;
 }