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

Fixed bug that caused booting being aborted in some cases (e.g. after ls).

Browse source
This commit is contained in:
Ben Gras 2005-07-20 15:16:53 +00:00
parent d5d9764dbb
commit f8af4da472
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot/bootimage.c
View file

@ -273,7 +273,8 @@ char *get_sector(u32_t vsec)
{ {
u32_t sec; u32_t sec;
int r; int r;
static char buf[32 * SECTOR_SIZE]; #define SECBUFS 16
static char buf[SECBUFS * SECTOR_SIZE];
static size_t count; /* Number of sectors in the buffer. */ static size_t count; /* Number of sectors in the buffer. */
static u32_t bufsec; /* First Sector now in the buffer. */ static u32_t bufsec; /* First Sector now in the buffer. */
@ -298,7 +299,7 @@ char *get_sector(u32_t vsec)
bufsec= sec; bufsec= sec;
/* Read a whole track if possible. */ /* Read a whole track if possible. */
while (++count < 32 && !dev_boundary(bufsec + count)) { while (++count < SECBUFS && !dev_boundary(bufsec + count)) {
vsec++; vsec++;
if ((sec= (*vir2sec)(vsec)) == -1) break; if ((sec= (*vir2sec)(vsec)) == -1) break;
@ -641,7 +642,7 @@ char *select_image(char *image)
image= strcpy(malloc((strlen(image) + 1 + NAME_MAX + 1) image= strcpy(malloc((strlen(image) + 1 + NAME_MAX + 1)
* sizeof(char)), image); * sizeof(char)), image);
if (fsok == -1) fsok= r_super(&block_size) != 0; fsok= r_super(&block_size) != 0;
if (!fsok || (image_ino= r_lookup(ROOT_INO, image)) == 0) { if (!fsok || (image_ino= r_lookup(ROOT_INO, image)) == 0) {
char *size; char *size;