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

Made Xorriso_path_from_lba() ready for long block adresses

Browse Source
This commit is contained in:
Thomas Schmitt 2024-03-21 16:07:16 +01:00
parent 458b0cb3de
commit ec7ab520ba
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorriso/iso_img.c
View File

@ -150,7 +150,7 @@ int Xorriso_record_boot_info(struct XorrisO *xorriso, int flag)
Xorriso__file_start_lba((IsoNode *) bootimg_node, Xorriso__file_start_lba((IsoNode *) bootimg_node,
&(xorriso->loaded_boot_bin_lba), 0); &(xorriso->loaded_boot_bin_lba), 0);
if(bootcat_node != NULL) 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); xorriso->loaded_boot_cat_path, 0);
return(1); return(1);
} }

4
xorriso/iso_tree.c
View File

@ -459,7 +459,7 @@ ex:;
*/ */
/* @param flag bit0= use lba rather than node pointer /* @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) char path[SfileadrL], int flag)
{ {
int ret; int ret;
@ -477,7 +477,7 @@ int Xorriso_path_from_lba(struct XorrisO *xorriso, IsoNode *node, int lba,
return(ret); return(ret);
} }
if(flag & 1) 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 else
Findjob_set_wanted_node(job, (void *) node, 0); Findjob_set_wanted_node(job, (void *) node, 0);
Findjob_set_action_found_path(job, 0); Findjob_set_action_found_path(job, 0);

4
xorriso/iso_tree.h
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2022 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2024 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. 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, int Xorriso_path_from_node(struct XorrisO *xorriso, IsoNode *in_node,
char path[SfileadrL], int flag); 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); char path[SfileadrL], int flag);
int Xorriso_get_attr_value(struct XorrisO *xorriso, void *in_node, char *path, int Xorriso_get_attr_value(struct XorrisO *xorriso, void *in_node, char *path,

6
xorriso/write_run.c
View File

@ -2,7 +2,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* 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. 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"); sprintf(xorriso->info_text, "Patching boot info table");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
ret= Xorriso_path_from_lba(xorriso, NULL, xorriso->loaded_boot_bin_lba, ret= Xorriso_path_from_lba(xorriso, NULL,
sfe, 1); (off_t) xorriso->loaded_boot_bin_lba, sfe, 1);
if(ret < 0) if(ret < 0)
goto ex; goto ex;
if(ret == 0) { if(ret == 0) {

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2024.03.21.084436" #define Xorriso_timestamP "2024.03.21.150655"