libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug #139 related to a wrong constant usage on non-emulated boot images.

Browse Source
This commit is contained in:
Vreixo Formoso 2008-08-28 16:44:54 +02:00
parent 75c44a1474
commit 33e058a66a
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libisofs/eltorito.c
View File

@ -60,7 +60,7 @@ struct hard_disc_mbr {
*/ */
void el_torito_set_load_seg(ElToritoBootImage *bootimg, short segment) void el_torito_set_load_seg(ElToritoBootImage *bootimg, short segment)
{ {
if (bootimg->type != ELTORITO_NO_EMUL) if (bootimg->type != 0)
return; return;
bootimg->load_seg = segment; bootimg->load_seg = segment;
} }
@ -72,7 +72,7 @@ void el_torito_set_load_seg(ElToritoBootImage *bootimg, short segment)
*/ */
void el_torito_set_load_size(ElToritoBootImage *bootimg, short sectors) void el_torito_set_load_size(ElToritoBootImage *bootimg, short sectors)
{ {
if (bootimg->type != ELTORITO_NO_EMUL) if (bootimg->type != 0)
return; return;
bootimg->load_size = sectors; bootimg->load_size = sectors;
} }
@ -96,6 +96,33 @@ void el_torito_patch_isolinux_image(ElToritoBootImage *bootimg)
bootimg->isolinux = 1; bootimg->isolinux = 1;
} }
/* TODO getter for boot image properties should be exposed
* useful when reading discs */
int el_torito_get_boot_media_type(const ElToritoBootImage *bootimg)
{
if (bootimg) {
switch (bootimg->type) {
case 1:
case 2:
case 3:
return ELTORITO_FLOPPY_EMUL;
break;
case 4:
return ELTORITO_HARD_DISC_EMUL;
break;
case 0:
return ELTORITO_NO_EMUL;
break;
default:
/* should never happen */
return ISO_ASSERT_FAILURE;
break;
}
} else {
return ISO_WRONG_ARG_VALUE;
}
}
static static
int iso_tree_add_boot_node(IsoDir *parent, const char *name, IsoBoot **boot) int iso_tree_add_boot_node(IsoDir *parent, const char *name, IsoBoot **boot)
{ {