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

Avoided SORRY event for missing disk file during hardlink update

Browse Source
This commit is contained in:
Thomas Schmitt 2010-01-19 13:35:39 +00:00
parent 42cf661ef8
commit 6950650a82
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.01.17.145751" #define Xorriso_timestamP "2010.01.19.133712"

9
xorriso/xorrisoburn.c
View File

@ -7704,10 +7704,10 @@ int Xorriso_widen_hardlink(struct XorrisO *xorriso, void * boss_iter,
/* Lookup all di_array instances of node */ /* Lookup all di_array instances of node */
if(LIBISO_ISDIR(node)) if(LIBISO_ISDIR(node))
return(1); return(3);
ret= Xorriso_search_di_range(xorriso, node, &idx, &low, &high, 2); ret= Xorriso_search_di_range(xorriso, node, &idx, &low, &high, 2);
if(ret <= 0) if(ret <= 0)
return(1); return(3);
/* Check and reset di_do_widen bits */ /* Check and reset di_do_widen bits */
for(i= low; i <= high; i++) { for(i= low; i <= high; i++) {
if(node != xorriso->di_array[i]) /* might be NULL */ if(node != xorriso->di_array[i]) /* might be NULL */
@ -7717,12 +7717,15 @@ int Xorriso_widen_hardlink(struct XorrisO *xorriso, void * boss_iter,
xorriso->di_do_widen[i / 8]&= ~(1 << (i % 8)); xorriso->di_do_widen[i / 8]&= ~(1 << (i % 8));
} }
if(idx < 0 || !do_widen) if(idx < 0 || !do_widen)
return(1); return(3);
ret= Xorriso_pfx_disk_path(xorriso, abs_path, iso_prefix, disk_prefix, ret= Xorriso_pfx_disk_path(xorriso, abs_path, iso_prefix, disk_prefix,
disk_path, 0); disk_path, 0);
if(ret <= 0) if(ret <= 0)
return(ret); return(ret);
ret= Sfile_type(disk_path, 1);
if(ret < 0)
return(3); /* does not exist on disk */
/* >>> compare_result bit17 = is_split */; /* >>> compare_result bit17 = is_split */;