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

Bug fix: -osirrox "concat_split_on" worked only together with -split_size larger than 0. Thanks William Willems.

Browse Source
This commit is contained in:
Thomas Schmitt
2019-10-11 12:46:50 +02:00
parent cb597ec570
commit e2c71a34d0
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xorriso/read_run.c
View File

@ -2,7 +2,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2019 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later.
@ -1062,7 +1062,7 @@ int Xorriso_restore_disk_object(struct XorrisO *xorriso,
if(LIBISO_ISDIR(node) && xorriso->do_concat_split)
leaf_is_split= Xorriso_identify_split(xorriso, img_path, node,
&split_parts, &split_count, &stbuf, 1|2);
&split_parts, &split_count, &stbuf, 1 | 4);
if(leaf_is_split) {
/* map all files in directory img_path into regular file disk_path */
@ -1437,7 +1437,7 @@ much_too_long:;
source_is_dir= 1;
source_is_split= 0;
if(source_is_dir)
source_is_split= Xorriso_is_split(xorriso, img_path, node, 1|2);
source_is_split= Xorriso_is_split(xorriso, img_path, node, 1 | 2 | 4);
if(source_is_split)
do_not_dive= 1;
@ -1627,7 +1627,7 @@ int Xorriso_restore(struct XorrisO *xorriso,
ret= 0; goto ex;
}
if(is_dir && xorriso->do_concat_split)
leaf_is_split= Xorriso_is_split(xorriso, img_path, node, 1|2);
leaf_is_split= Xorriso_is_split(xorriso, img_path, node, 1 | 2 | 4);
}
for(npt= apt; !done; apt= npt+1) {
npt= strchr(apt, '/');