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

New API calls el_torito_get_isolinux_options(), el_torito_get_boot_media_type()

Browse Source
This commit is contained in:
Thomas Schmitt 2010-04-25 14:11:45 +02:00
parent a3fe82100b
commit 03b030c56d
2 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libisofs/eltorito.c
View File

@ -191,31 +191,36 @@ int el_torito_set_isolinux_options(ElToritoBootImage *bootimg, int options, int
return ISO_SUCCESS; return ISO_SUCCESS;
} }
/* TODO getter for boot image properties should be exposed /* API */
* useful when reading discs */ int el_torito_get_isolinux_options(ElToritoBootImage *bootimg, int flag)
int el_torito_get_boot_media_type(const ElToritoBootImage *bootimg) {
return bootimg->isolinux_options & 0x03;
}
/* API */
int el_torito_get_boot_media_type(ElToritoBootImage *bootimg,
enum eltorito_boot_media_type *media_type)
{ {
if (bootimg) { if (bootimg) {
switch (bootimg->type) { switch (bootimg->type) {
case 1: case 1:
case 2: case 2:
case 3: case 3:
return ELTORITO_FLOPPY_EMUL; *media_type = ELTORITO_FLOPPY_EMUL;
break; return 1;
case 4: case 4:
return ELTORITO_HARD_DISC_EMUL; *media_type = ELTORITO_HARD_DISC_EMUL;
break; return 1;
case 0: case 0:
return ELTORITO_NO_EMUL; *media_type = ELTORITO_NO_EMUL;
break; return 1;
default: default:
/* should never happen */ /* should never happen */
return ISO_ASSERT_FAILURE; return ISO_ASSERT_FAILURE;
break; break;
} }
} else {
return ISO_WRONG_ARG_VALUE;
} }
return ISO_WRONG_ARG_VALUE;
} }
static static

36
libisofs/libisofs.h
View File

@ -2419,7 +2419,7 @@ int iso_image_get_all_boot_imgs(IsoImage *image, int *num_boots,
/** /**
* Removes the El-Torito bootable image. * Removes all El-Torito boot images from the ISO image.
* *
* The IsoBoot node that acts as placeholder for the catalog is also removed * The IsoBoot node that acts as placeholder for the catalog is also removed
* for the image tree, if there. * for the image tree, if there.
@ -2449,11 +2449,28 @@ void iso_image_remove_boot_image(IsoImage *image);
*/ */
int iso_image_set_boot_catalog_weight(IsoImage *image, int sort_weight); int iso_image_set_boot_catalog_weight(IsoImage *image, int sort_weight);
/**
* Get the boot media type as of parameter "type" of iso_image_set_boot_image()
* resp. iso_image_add_boot_image().
*
* @param bootimg
* The image to inquire
* @param media_type
* Returns the media type
* @return
* 1 = ok , < 0 = error
*
* @since 0.6.32
*/
int el_torito_get_boot_media_type(ElToritoBootImage *bootimg,
enum eltorito_boot_media_type *media_type);
/** /**
* Sets the platform ID of the boot image. * Sets the platform ID of the boot image.
* *
* The Platform ID gets written into the boot catalog at byte 1 of the * The Platform ID gets written into the boot catalog at byte 1 of the
* Validation Entry, or at byte 1 of a Section Header Entry. * Validation Entry, or at byte 1 of a Section Header Entry.
* If Platform ID and ID String of two consequtive bootimages are the same
* *
* @param bootimg * @param bootimg
* The image to manipulate. * The image to manipulate.
@ -2661,7 +2678,22 @@ void el_torito_patch_isolinux_image(ElToritoBootImage *bootimg);
* 1 success, < 0 on error * 1 success, < 0 on error
* @since 0.6.12 * @since 0.6.12
*/ */
int el_torito_set_isolinux_options(ElToritoBootImage *bootimg, int options, int flag); int el_torito_set_isolinux_options(ElToritoBootImage *bootimg,
int options, int flag);
/**
* Get the options as of el_torito_set_isolinux_options().
*
* @param bootimg
* The image to inquire
* @param flag
* Reserved for future usage, set to 0.
* @return
* >= 0 returned option bits , <0 = error
*
* @since 0.6.32
*/
int el_torito_get_isolinux_options(ElToritoBootImage *bootimg, int flag);
/** /**
* Obtain a copy of the eventually loaded first 32768 bytes of the imported * Obtain a copy of the eventually loaded first 32768 bytes of the imported