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

Fixed bug that caused the PM to brutalize the contents of the 'memory'

Browse source 
variable. Parsing worked, but future requests for the variable (such as
by the sysenv command) returned truncated data. This caused the system
(e.g. setup script) to think the amount of memory was tiny, and caused
the enabling of swapspace, while it is unnecessary.
This commit is contained in:
Ben Gras 2005-06-19 23:16:08 +00:00
parent 400169e960
commit 45ddea1cdd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/pm/main.c
View file

@ -256,7 +256,7 @@ struct memory *mem_chunks; /* store mem chunks here */
*/
long base, size, limit;
char *s, *end; /* use to parse boot variable */
int i;
int i, done = 0;
struct memory *memp;
#if _WORD_SIZE == 2
unsigned long max_address;
@ -278,7 +278,7 @@ struct memory *mem_chunks; /* store mem chunks here */
* and b2:s2 are combined if the memory is adjacent.
*/
s = find_param("memory"); /* get memory boot variable */
for (i = 0; i < NR_MEMS; i++) {
for (i = 0; i < NR_MEMS && !done; i++) {
memp = &mem_chunks[i]; /* next mem chunk is stored here */
base = size = 0; /* initialize next base:size pair */
if (*s != 0) { /* get fresh data, unless at end */
@ -291,7 +291,7 @@ struct memory *mem_chunks; /* store mem chunks here */
/* Read fresh size and expect comma or assume end. */
size = strtoul(s, &end, 0x10); /* get number */
if (end != s && *end == ',') s = ++end; /* skip ',' */
else *s=0; /* found end */
else done = 1;
}
limit = base + size;
#if _WORD_SIZE == 2