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

Made Xorriso_assert_volid() ready for long block adresses

This commit is contained in:
Thomas Schmitt 2024-03-20 22:38:23 +01:00
parent cdffa4efee
commit 4c7cfe96d9
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorriso/drive_mgt.c
View File

@ -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;
}

12
xorriso/iso_img.c
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2023 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2024 Thomas Schmitt, <scdbackup@gmx.net>
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);

4
xorriso/iso_img.h
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2024 Thomas Schmitt, <scdbackup@gmx.net>
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);

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2024.03.20.150514"
#define Xorriso_timestamP "2024.03.20.213801"