diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c index ceb59523..a6c22899 100644 --- a/xorriso/xorriso.c +++ b/xorriso/xorriso.c @@ -4562,8 +4562,13 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr, strcat(a, " "); if(adr_common_tail[0]) strcat(a, Text_shellsafe(adr_common_tail, sfe, 0)); - else + else { + Text_shellsafe(disk_adr, a+strlen(a), 0); + strcat(a, " (DISK)"); +/* strcat(a, "'.'"); +*/ + } strcat(a, " :"); if(flag&(1<<30)) a[0]= 0; @@ -7729,7 +7734,7 @@ delete:; Splitpart__compose(part_path+strlen(iso_rr_path)+1, partno, new_total_parts, offset, first_bytes, disk_size, 0); ret= Xorriso_graft_in(xorriso, boss_iter, disk_path, part_path, - offset, bytes, 2|(flag&4)|8); + offset, bytes, 2|(flag&4)|8|128); if(ret<=0) goto ex; } diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index c564f01a..69cf4b99 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.06.17.133914" +#define Xorriso_timestamP "2008.06.17.170622" diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c index f9229468..f6b9cc36 100644 --- a/xorriso/xorrisoburn.c +++ b/xorriso/xorrisoburn.c @@ -1977,6 +1977,7 @@ int Xorriso_copy_properties(struct XorrisO *xorriso, bit3= use offset and cut_size for cut_out_node bit4= return 3 on rejection by exclusion or user bit5= if directory then do not add sub tree + bit7= no special handling of split file directories @return <=0 = error , 1 = added simple node , 2 = added directory , 3 = rejected */ @@ -2097,7 +2098,7 @@ int Xorriso_graft_in(struct XorrisO *xorriso, void *boss_iter, target_is_dir= LIBISO_ISDIR(node); target_is_split= 0; - if(target_is_dir) + if(target_is_dir && !(flag&128)) target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1); if(!((target_is_dir && !target_is_split) && source_is_dir)) { @@ -5586,6 +5587,8 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job, } if(no_dive || !LIBISO_ISDIR((IsoNode *) dir_node)) {ret= 1; goto ex;} + if(Xorriso_is_split(xorriso, dir_path, (IsoNode *) dir_node, 1)>0) + {ret= 1; goto ex;} mem= boss_mem; hflag= 1;