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

Let -as mkisofs --zisofs-version-2 imply -z

Browse Source
This commit is contained in:
Thomas Schmitt
2020-10-16 11:18:18 +02:00
parent fb0d617674
commit 2f44446d05
5 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xorriso/emulators.c
View File

@ -1610,6 +1610,7 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
ret= Xorriso_option_zisofs(xorriso, "version_2=as_needed", 0); ret= Xorriso_option_zisofs(xorriso, "version_2=as_needed", 0);
if(ret <= 0) if(ret <= 0)
goto problem_handler_1; goto problem_handler_1;
Xorriso_option_zisofs(xorriso, "by_magic=on", 0);
} else if(strcmp(argpt, "--stdio_sync")==0) { } else if(strcmp(argpt, "--stdio_sync")==0) {
if(i+1>=argc) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2020.10.14.210148" #define Xorriso_timestamP "2020.10.16.091750"

2
xorriso/xorrisofs.1
View File

@ -277,6 +277,8 @@ and will complain like
.br .br
The files will then appear as they were submitted to xorriso, i.e. with zisofs2 The files will then appear as they were submitted to xorriso, i.e. with zisofs2
header, block pointer list, and compressed data. header, block pointer list, and compressed data.
.br
\-\-zisofs\-version\-2 also enables \-z.
.TP .TP
\fB\-root\fR iso_rr_path \fB\-root\fR iso_rr_path
Insert all files under the given iso_rr_path. If option \-graft\-points is given, Insert all files under the given iso_rr_path. If option \-graft\-points is given,

71
xorriso/xorrisofs.info
View File

@ -277,6 +277,7 @@ File: xorrisofs.info, Node: SetInsert, Next: SetProduct, Prev: Loading, Up:
isofs: Unknown ZF compression algorithm: PZ isofs: Unknown ZF compression algorithm: PZ
The files will then appear as they were submitted to xorriso, i.e. The files will then appear as they were submitted to xorriso, i.e.
with zisofs2 header, block pointer list, and compressed data. with zisofs2 header, block pointer list, and compressed data.
-zisofs-version-2 also enables -z.
-root iso_rr_path -root iso_rr_path
Insert all files under the given iso_rr_path. If option Insert all files under the given iso_rr_path. If option
-graft-points is given, then iso_rr_path is prepended to each -graft-points is given, then iso_rr_path is prepended to each
@ -2002,10 +2003,10 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* --old-empty old block addresses for empty files: SetProduct. * --old-empty old block addresses for empty files: SetProduct.
(line 105) (line 105)
* --old-root-devno enable disk idevno with -old-root: SetInsert. * --old-root-devno enable disk idevno with -old-root: SetInsert.
(line 92) (line 93)
* --old-root-no-ino disable disk ino with -old-root: SetInsert. * --old-root-no-ino disable disk ino with -old-root: SetInsert.
(line 81) (line 82)
* --old-root-no-md5 disable MD5 with -old-root: SetInsert. (line 99) * --old-root-no-md5 disable MD5 with -old-root: SetInsert. (line 100)
* --protective-msdos-label Patch System Area partition table: SystemArea. * --protective-msdos-label Patch System Area partition table: SystemArea.
(line 143) (line 143)
* --quoted_path_list read pathspecs from disk file: SetInsert. * --quoted_path_list read pathspecs from disk file: SetInsert.
@ -2154,7 +2155,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -no-pad do not add zeros to ISO tree: SetProduct. (line 101) * -no-pad do not add zeros to ISO tree: SetProduct. (line 101)
* -o set output file address: SetProduct. (line 8) * -o set output file address: SetProduct. (line 8)
* -old-exclude exclude disk files from inserting: SetInsert. (line 42) * -old-exclude exclude disk files from inserting: SetInsert. (line 42)
* -old-root enable incremental insertion: SetInsert. (line 68) * -old-root enable incremental insertion: SetInsert. (line 69)
* -omit-period omit trailing dot in ISO file names: SetCompl. (line 54) * -omit-period omit trailing dot in ISO file names: SetCompl. (line 54)
* -omit-version-number omit version number in ISO file names: SetCompl. * -omit-version-number omit version number in ISO file names: SetCompl.
(line 69) (line 69)
@ -2186,7 +2187,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -relaxed-filenames 7-bit special characters in ISO file names: SetCompl. * -relaxed-filenames 7-bit special characters in ISO file names: SetCompl.
(line 45) (line 45)
* -rock Rock Ridge (is enabled by default): SetExtras. (line 13) * -rock Rock Ridge (is enabled by default): SetExtras. (line 13)
* -root redirect ISO root directory: SetInsert. (line 63) * -root redirect ISO root directory: SetInsert. (line 64)
* -rr_reloc_dir set deep directory relocation target: SetExtras. * -rr_reloc_dir set deep directory relocation target: SetExtras.
(line 74) (line 74)
* -sparc-boot SUN SPARC boot images: SystemArea. (line 298) * -sparc-boot SUN SPARC boot images: SystemArea. (line 298)
@ -2334,12 +2335,12 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Hiding, from Joliet, -hide-joliet-list: SetHide. (line 22) * Hiding, from Joliet, -hide-joliet-list: SetHide. (line 22)
* Image size, alignment, -partition_cyl_align: SystemArea. (line 186) * Image size, alignment, -partition_cyl_align: SystemArea. (line 186)
* Incremental insertion, disable disk ino, --old-root-no-ino: SetInsert. * Incremental insertion, disable disk ino, --old-root-no-ino: SetInsert.
(line 81) (line 82)
* Incremental insertion, disable MD5, --old-root-no-md5: SetInsert. * Incremental insertion, disable MD5, --old-root-no-md5: SetInsert.
(line 99) (line 100)
* Incremental insertion, enable disk devno, --old-root-devno: SetInsert. * Incremental insertion, enable disk devno, --old-root-devno: SetInsert.
(line 92) (line 93)
* Incremental insertion, enable, -old-root: SetInsert. (line 68) * Incremental insertion, enable, -old-root: SetInsert. (line 69)
* Interval reader for system area and partitions: SystemArea. (line 24) * Interval reader for system area and partitions: SystemArea. (line 24)
* ISO 9660, _definition: Standards. (line 6) * ISO 9660, _definition: Standards. (line 6)
* ISO 9660:1999, _definition: Standards. (line 26) * ISO 9660:1999, _definition: Standards. (line 26)
@ -2367,7 +2368,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
(line 23) (line 23)
* ISO level, specify, -iso-level: SetCompl. (line 7) * ISO level, specify, -iso-level: SetCompl. (line 7)
* ISO level, specify, -iso-level <1>: SetCompl. (line 8) * ISO level, specify, -iso-level <1>: SetCompl. (line 8)
* ISO root directory, redirect, -root: SetInsert. (line 63) * ISO root directory, redirect, -root: SetInsert. (line 64)
* iso_rr_path, _definition: Insert. (line 8) * iso_rr_path, _definition: Insert. (line 8)
* Jigdo Template Extraction, -checksum-list: Jigdo. (line 77) * Jigdo Template Extraction, -checksum-list: Jigdo. (line 77)
* Jigdo Template Extraction, -checksum_algorithm_iso: Jigdo. (line 86) * Jigdo Template Extraction, -checksum_algorithm_iso: Jigdo. (line 86)
@ -2454,30 +2455,30 @@ Node: Xorriso5616
Node: Options6762 Node: Options6762
Node: Loading7489 Node: Loading7489
Node: SetInsert9530 Node: SetInsert9530
Node: SetProduct14340 Node: SetProduct14380
Node: SetCompl19911 Node: SetCompl19951
Node: SetExtras22503 Node: SetExtras22543
Node: SetHide34112 Node: SetHide34152
Node: ImageId35416 Node: ImageId35456
Node: Bootable39698 Node: Bootable39738
Node: SystemArea45984 Node: SystemArea46024
Node: Charset64333 Node: Charset64373
Node: Jigdo65358 Node: Jigdo65398
Node: Miscellaneous70328 Node: Miscellaneous70368
Node: Examples71973 Node: Examples72013
Node: ExSimple72467 Node: ExSimple72507
Node: ExGraft72950 Node: ExGraft72990
Node: ExMkisofs74250 Node: ExMkisofs74290
Node: ExGrowisofs76058 Node: ExGrowisofs76098
Node: ExIncBackup77248 Node: ExIncBackup77288
Node: ExIncBckAcc80424 Node: ExIncBckAcc80464
Node: ExBootable82129 Node: ExBootable82169
Node: Files86311 Node: Files86351
Node: Environ87406 Node: Environ87446
Node: Seealso88279 Node: Seealso88319
Node: Bugreport88930 Node: Bugreport88970
Node: Legal89523 Node: Legal89563
Node: CommandIdx90420 Node: CommandIdx90460
Node: ConceptIdx106914 Node: ConceptIdx106954
 
End Tag Table End Tag Table

2
xorriso/xorrisofs.texi
View File

@ -436,6 +436,8 @@ and will complain like
@* @*
The files will then appear as they were submitted to xorriso, i.e. with zisofs2 The files will then appear as they were submitted to xorriso, i.e. with zisofs2
header, block pointer list, and compressed data. header, block pointer list, and compressed data.
@*
--zisofs-version-2 also enables -z.
@c man .TP @c man .TP
@item -root iso_rr_path @item -root iso_rr_path
@kindex -root redirect ISO root directory @kindex -root redirect ISO root directory