search for: ebr_table

...-- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/com32/modules/chain.c b/com32/modules/chain.c index 91db9f7..b5c1d8f 100644 --- a/com32/modules/chain.c +++ b/com32/modules/chain.c @@ -558,7 +558,7 @@ static struct disk_part_iter *next_ebr_part(struct disk_part_iter *part) if (ebr_table[0].start_lba >= extended->start_lba + extended->length) { dprintf("Insane logical partition!\n"); - goto err_insane; + goto err_ebr; } } /* Success */ @@ -568,12 +568,7 @@ static struct disk_part_iter *next_ebr_part(struct disk_part_iter *part) part...

1) code split and move Iterator related functionality is yanked from chain.c and moved to iterator.{c,h}. Both are moved to com32/chain and this way chain.c is ready for further splitting. Alternatively, partiter could be moved to com32/lib at any time in the future. It's potentially useful for other modules (e.g. if someone wanted to code partition dumper or editor). 2) Iterator updates

...cur; + + while(part) { + cur = part; + if(part->next == next_ebr_part) + part = part->private.ebr.parent; + else + part = NULL; + free(cur->block); + free(cur); + } +} + static struct disk_part_iter *next_ebr_part(struct disk_part_iter *part) { const struct part_entry *ebr_table; @@ -570,10 +588,7 @@ static struct disk_part_iter *next_ebr_part(struct disk_part_iter *part) err_ebr: out_finished: - free(part->private.ebr.parent->block); - free(part->private.ebr.parent); - free(part->block); - free(part); + free_iter(part); return NULL; }...

This patch introduces extra functionality to chain.c, mainly with reference to BPB adjustments, but not only that. It expects 3 small patches I sent earlier (they are included for easy reference, patches 1-3/4). The changes introduced are: 1) file and boot sector use separate options to control load address and jump address (if applicable). Options are as described below: *