From 4c7cfe96d9525e05ef8cfa4809df3aa65110c39e Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 20 Mar 2024 22:38:23 +0100 Subject: [PATCH] Made Xorriso_assert_volid() ready for long block adresses --- xorriso/drive_mgt.c | 2 +- xorriso/iso_img.c | 12 +++++++----- xorriso/iso_img.h | 4 ++-- xorriso/xorriso_timestamp.h | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c index c5fbb33e..f056c9db 100644 --- a/xorriso/drive_mgt.c +++ b/xorriso/drive_mgt.c @@ -319,7 +319,7 @@ int Xorriso_make_read_options(struct XorrisO *xorriso, "Loading ISO image tree from LBA %.f", (double) load_lba); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); } - ret= Xorriso_assert_volid(xorriso, (int) load_lba, 0); + ret= Xorriso_assert_volid(xorriso, load_lba, 0); if(ret <= 0) goto ex; } diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index 36b3fb3c..7b6b09fb 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2023 Thomas Schmitt, + Copyright 2007-2024 Thomas Schmitt, Provided under GPL version 2 or later. @@ -156,9 +156,10 @@ int Xorriso_record_boot_info(struct XorrisO *xorriso, int flag) } -int Xorriso_assert_volid(struct XorrisO *xorriso, int msc1, int flag) +int Xorriso_assert_volid(struct XorrisO *xorriso, off_t msc1, int flag) { - int ret, image_blocks; + int ret; + off_t image_blocks; char volid[33]; struct burn_drive_info *dinfo; struct burn_drive *drive; @@ -169,11 +170,12 @@ int Xorriso_assert_volid(struct XorrisO *xorriso, int msc1, int flag) "on attempt to perform -assert_volid", 0); if(ret<=0) return(0); - ret= isoburn_read_iso_head(drive, msc1, &image_blocks, volid, 1); + ret= isoburn_read_iso_head_v2(drive, msc1, &image_blocks, volid, 1); Xorriso_process_msg_queues(xorriso,0); if(ret <= 0) { sprintf(xorriso->info_text, - "-assert_volid: Cannot determine Volume Id at LBA %d.", msc1); + "-assert_volid: Cannot determine Volume Id at LBA %.f.", + (double) msc1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, xorriso->assert_volid_sev, 0); return(0); diff --git a/xorriso/iso_img.h b/xorriso/iso_img.h index 72f2cba6..6093521d 100644 --- a/xorriso/iso_img.h +++ b/xorriso/iso_img.h @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2015 Thomas Schmitt, + Copyright 2007-2024 Thomas Schmitt, Provided under GPL version 2 or later. @@ -18,7 +18,7 @@ int Xorriso_update_volid(struct XorrisO *xorriso, int flag); int Xorriso_record_boot_info(struct XorrisO *xorriso, int flag); -int Xorriso_assert_volid(struct XorrisO *xorriso, int msc1, int flag); +int Xorriso_assert_volid(struct XorrisO *xorriso, off_t msc1, int flag); int Xorriso_is_isohybrid(struct XorrisO *xorriso, IsoFile *bootimg_node, int flag); diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 770d1292..564783b9 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2024.03.20.150514" +#define Xorriso_timestamP "2024.03.20.213801"