From ec7ab520baa79b18321c3ce952e410ada87e915b Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 21 Mar 2024 16:07:16 +0100 Subject: [PATCH] Made Xorriso_path_from_lba() ready for long block adresses --- xorriso/iso_img.c | 2 +- xorriso/iso_tree.c | 4 ++-- xorriso/iso_tree.h | 4 ++-- xorriso/write_run.c | 6 +++--- xorriso/xorriso_timestamp.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index 517cb29a..1b481038 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -150,7 +150,7 @@ int Xorriso_record_boot_info(struct XorrisO *xorriso, int flag) Xorriso__file_start_lba((IsoNode *) bootimg_node, &(xorriso->loaded_boot_bin_lba), 0); if(bootcat_node != NULL) - Xorriso_path_from_lba(xorriso, (IsoNode *) bootcat_node, 0, + Xorriso_path_from_lba(xorriso, (IsoNode *) bootcat_node, (off_t) 0, xorriso->loaded_boot_cat_path, 0); return(1); } diff --git a/xorriso/iso_tree.c b/xorriso/iso_tree.c index 068494ae..5d12d4e0 100644 --- a/xorriso/iso_tree.c +++ b/xorriso/iso_tree.c @@ -459,7 +459,7 @@ ex:; */ /* @param flag bit0= use lba rather than node pointer */ -int Xorriso_path_from_lba(struct XorrisO *xorriso, IsoNode *node, int lba, +int Xorriso_path_from_lba(struct XorrisO *xorriso, IsoNode *node, off_t lba, char path[SfileadrL], int flag) { int ret; @@ -477,7 +477,7 @@ int Xorriso_path_from_lba(struct XorrisO *xorriso, IsoNode *node, int lba, return(ret); } if(flag & 1) - Findjob_set_lba_range(job, (off_t) lba, (off_t) 1, 0); + Findjob_set_lba_range(job, lba, (off_t) 1, 0); else Findjob_set_wanted_node(job, (void *) node, 0); Findjob_set_action_found_path(job, 0); diff --git a/xorriso/iso_tree.h b/xorriso/iso_tree.h index 873f49db..89957066 100644 --- a/xorriso/iso_tree.h +++ b/xorriso/iso_tree.h @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2022 Thomas Schmitt, + Copyright 2007-2024 Thomas Schmitt, Provided under GPL version 2 or later. @@ -49,7 +49,7 @@ int Xorriso_node_is_valid(struct XorrisO *xorriso, IsoNode *in_node, int flag); int Xorriso_path_from_node(struct XorrisO *xorriso, IsoNode *in_node, char path[SfileadrL], int flag); -int Xorriso_path_from_lba(struct XorrisO *xorriso, IsoNode *node, int lba, +int Xorriso_path_from_lba(struct XorrisO *xorriso, IsoNode *node, off_t lba, char path[SfileadrL], int flag); int Xorriso_get_attr_value(struct XorrisO *xorriso, void *in_node, char *path, diff --git a/xorriso/write_run.c b/xorriso/write_run.c index 89999756..cd8e0afb 100644 --- a/xorriso/write_run.c +++ b/xorriso/write_run.c @@ -2,7 +2,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. @@ -1376,8 +1376,8 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag) sprintf(xorriso->info_text, "Patching boot info table"); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); - ret= Xorriso_path_from_lba(xorriso, NULL, xorriso->loaded_boot_bin_lba, - sfe, 1); + ret= Xorriso_path_from_lba(xorriso, NULL, + (off_t) xorriso->loaded_boot_bin_lba, sfe, 1); if(ret < 0) goto ex; if(ret == 0) { diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 7b463134..5bd14fa8 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2024.03.21.084436" +#define Xorriso_timestamP "2024.03.21.150655"