49,6 → 49,7 |
* @param buf Destination buffer (will always null-terminate). |
* @param n Size of destination buffer. |
* @param cmd_line Input string (the command line). |
* |
*/ |
static void extract_command(char *buf, size_t n, const char *cmd_line) |
{ |
57,7 → 58,8 |
|
/* Find the first space. */ |
end = strchr(cmd_line, ' '); |
if (end == NULL) end = cmd_line + strlen(cmd_line); |
if (end == NULL) |
end = cmd_line + strlen(cmd_line); |
|
/* |
* Find last occurence of '/' before 'end'. If found, place start at |
80,6 → 82,7 |
} |
|
/** C part of ia32 boot sequence. |
* |
* @param signature Should contain the multiboot signature. |
* @param mi Pointer to the multiboot information structure. |
*/ |
89,9 → 92,9 |
mb_mod_t *mods; |
uint32_t i; |
|
if (signature == MULTIBOOT_LOADER_MAGIC) { |
if (signature == MULTIBOOT_LOADER_MAGIC) |
flags = mi->flags; |
} else { |
else { |
/* No multiboot info available. */ |
flags = 0; |
} |
111,13 → 114,11 |
extract_command(init.tasks[i].name, |
CONFIG_TASK_NAME_BUFLEN, |
mods[i].string); |
} else { |
} else |
init.tasks[i].name[0] = '\0'; |
} |
} |
} else { |
} else |
init.cnt = 0; |
} |
|
/* Copy memory map. */ |
|
141,9 → 142,8 |
} |
|
e820counter = i; |
} else { |
} else |
e820counter = 0; |
} |
|
#ifdef CONFIG_SMP |
/* Copy AP bootstrap routines below 1 MB. */ |