sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for loading kernel with multiboot

Browse source 
While parsing command line, only consider "variable=value" to
be part of environment.

Patch by Antoine Leca.
This commit is contained in:
Ben Gras 2012-02-09 18:49:24 +01:00
parent 3dd49be938
commit 636264c1c6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/arch/i386/pre_init.c
View file

@ -13,7 +13,6 @@
#include <minix/com.h> #include <minix/com.h>
#include <sys/param.h> #include <sys/param.h>
#include <machine/partition.h> #include <machine/partition.h>
#include "../../../boot/image.h"
#include "string.h" #include "string.h"
#include "arch_proto.h" #include "arch_proto.h"
#include "libexec.h" #include "libexec.h"
@ -147,6 +146,8 @@ PRIVATE void mb_print(char *str)
while (*str) { while (*str) {
if (*str == '\n') { if (*str == '\n') {
str++; str++;
while (print_col < MULTIBOOT_CONSOLE_COLS)
mb_put_char(' ', print_line, print_col++);
print_line++; print_line++;
print_col = 0; print_col = 0;
continue; continue;
@ -283,10 +284,10 @@ PRIVATE void get_parameters(multiboot_info_t *mbi)
value_i = 0; value_i = 0;
while (*p == ' ') p++; while (*p == ' ') p++;
if (!*p) break; if (!*p) break;
while (*p && *p != '=' && var_i < GRAN - 1) while (*p && *p != '=' && *p != ' ' && var_i < GRAN - 1)
var[var_i++] = *p++ ; var[var_i++] = *p++ ;
var[var_i] = 0; var[var_i] = 0;
p++; /* skip '=' */ if (*p++ != '=') continue; /* skip if not name=value */
while (*p && *p != ' ' && value_i < GRAN - 1) while (*p && *p != ' ' && value_i < GRAN - 1)
value[value_i++] = *p++ ; value[value_i++] = *p++ ;
value[value_i] = 0; value[value_i] = 0;