X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config.c;h=d144c9f0a9b1620a0f10b2ac98edce55f790ceb7;hb=35066b3244e795da02400086f85660e9b0b9e490;hp=00cd0236bd22a3be2e6ce6c85f761e9e7746cbc4;hpb=528b4479a96491431b243bf02da43c792962fb27;p=debian%2Felilo

diff --git a/config.c b/config.c
index 00cd023..d144c9f 100644
--- a/config.c
+++ b/config.c
@@ -56,7 +56,7 @@
  */
 #define ELILO_DEFAULT_CONFIG	L"elilo.conf"
 
-#define MAX_STRING	CMDLINE_MAXLEN
+#define MAX_STRING	512
 #define CONFIG_BUFSIZE	512	/* input buffer size */
 
 /*
@@ -71,7 +71,7 @@ typedef struct boot_image {
 	struct boot_image *next;
 	CHAR16	label[MAX_STRING];
 	CHAR16	kname[FILENAME_MAXLEN];
-	CHAR16  options[MAX_STRING];
+	CHAR16  options[CMDLINE_MAXLEN];
 	CHAR16	initrd[FILENAME_MAXLEN];
 	CHAR16	vmcode[FILENAME_MAXLEN];
 	CHAR16	root[FILENAME_MAXLEN];
@@ -100,7 +100,7 @@ typedef struct {
 	CHAR16		root[FILENAME_MAXLEN];	/* globally defined root fs */
 	CHAR16		initrd[FILENAME_MAXLEN];/* globally defined initrd  */
 	CHAR16		vmcode[FILENAME_MAXLEN];/* globally defined boot-time module  */
-	CHAR16		options[MAX_STRING];
+	CHAR16		options[CMDLINE_MAXLEN];
 	CHAR16		default_image_name[MAX_STRING];
 	CHAR16		message_file[MAX_MESSAGES][FILENAME_MAXLEN]; 
 	CHAR16		chooser[FILENAME_MAXLEN];/* which image chooser to use */
@@ -255,7 +255,16 @@ next(VOID)
 	back = 0;
 	return ch;
     }
-    return getc();
+/*
+ * config files served from pxe/tftpboot windows servers can contain
+ * extraneous '\r' characters, often the first char in the file, and
+ * we need to simply skip over those and continue on
+ */
+   ch = getc();
+   if(ch == '\r')
+	ch = getc();
+
+   return ch;
 }
 
 /*
@@ -310,13 +319,13 @@ get_token_core(CHAR16 *str, UINTN maxlen, BOOLEAN rhs)
     CHAR16 *here;
 
     for (;;) {
-	while ((ch = next()), ch == ' ' || ch == '\t' || ch == '\n') if (ch == '\n') line_num++;
+	while ((ch = next()), ch == ' ' || ch == '\t' || ch == '\n') if (ch == '\n' ) line_num++;
 
 	if (ch == CHAR_EOF) return TOK_EOF;
 
+	/* skip comment line */
 	if (ch != '#') break;
 
-	/* skip comment line */
 	while ((ch = next()), ch != '\n') if (ch == CHAR_EOF) return TOK_EOF;
 	line_num++;
     }
@@ -762,7 +771,10 @@ config_parse(VOID)
 
 		if (tok == TOK_EOF) break;
 
-		if (tok == TOK_ERR) return -1;
+		if (tok == TOK_ERR) {
+			Print(L"Bad Token from elilo config file, parser read: %s\n elilo exiting\n", str);
+			return -1;
+		}
 
 		if ( (p = find_option(current_options, str)) == NULL) {
 			config_error(L"Unkown option %s", str);
@@ -897,10 +909,10 @@ print_label_list(VOID)
 {
 	boot_image_t *img, *dfl = global_config.default_image;
 
-	if (dfl) Print(L"\t%s\n", dfl->label);
+	if (dfl) Print(L"    %s\n", dfl->label);
 
 	for (img = image_list; img; img = img->next) {
-		if (img != dfl) Print(L"\t%s\n", img->label);
+		if (img != dfl) Print(L"    %s\n", img->label);
 	}
 }