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

Updating sorted link array before usage after image manipulations

Browse Source
This commit is contained in:
Thomas Schmitt
2009-07-25 18:18:05 +00:00
parent 0136c7bab9
commit 2606a34ba8
5 changed files with 193 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libisoburn/trunk/xorriso/xorriso.c
View File

@ -5419,6 +5419,7 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
m->hln_count= 0;
m->hln_array= NULL;
m->hln_targets= NULL;
m->hln_change_pending= 0;
m->di_do_widen= NULL;
m->di_disk_paths= NULL;
m->di_iso_paths= NULL;
@ -5525,6 +5526,14 @@ int Xorriso_destroy(struct XorrisO **xorriso, int flag)
}
int Xorriso_set_change_pending(struct XorrisO *xorriso, int flag)
{
xorriso->volset_change_pending= 1;
xorriso->hln_change_pending= 1;
return(1);
}
int Xorriso_dialog_input(struct XorrisO *xorriso, char line[], int linesize,
int flag)
/*
@ -12975,8 +12984,7 @@ int Xorriso_restore_sorted(struct XorrisO *xorriso, int count,
{
int i, ret, with_node_array= 0, hflag= 0, hret;
if(xorriso->hln_array == NULL &&
!(((xorriso->ino_behavior & 16) && xorriso->do_restore_sort_lba) ||
if(!(((xorriso->ino_behavior & 16) && xorriso->do_restore_sort_lba) ||
(xorriso->ino_behavior & 4) || (flag & 1))) {
ret= Xorriso_make_hln_array(xorriso, 0);
if(ret<=0)
@ -13007,7 +13015,7 @@ int Xorriso_restore_sorted(struct XorrisO *xorriso, int count,
/* Allocate and fill node array */
if(xorriso->node_counter <= 0)
{ret= 2; goto ex;}
ret= Xorriso_new_node_array(xorriso, xorriso->temp_mem_limit,
ret= Xorriso_new_node_array(xorriso, xorriso->temp_mem_limit, 0,
!xorriso->do_restore_sort_lba);
if(ret<=0)
goto ex;