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

Changed --zisofs-susp-z2 to --zisofs2-susp-z2, added --zisofs2-susp-zf

Browse Source
This commit is contained in:
Thomas Schmitt 2020-10-29 20:14:29 +01:00
parent d2f10a1768
commit 80b4d29a81
5 changed files with 99 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xorriso/emulators.c
View File

@ -636,7 +636,8 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus", "-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus",
"-isohybrid-apm-hfsplus", "--grub2-boot-info", "-joliet-utf16", "-isohybrid-apm-hfsplus", "--grub2-boot-info", "-joliet-utf16",
"-appended_part_as_gpt", "-appended_part_as_apm", "--mbr-force-bootable", "-appended_part_as_gpt", "-appended_part_as_apm", "--mbr-force-bootable",
"-part_like_isohybrid", "--zisofs-version-2", "--zisofs-susp-z2", "-part_like_isohybrid", "--zisofs-version-2", "--zisofs2-susp-z2",
"--zisofs2-susp-zf",
"" ""
}; };
static char arg1_options[][41]= { static char arg1_options[][41]= {
@ -949,7 +950,8 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -z, -transparent-compression", " -z, -transparent-compression",
" Enable transparent compression of files", " Enable transparent compression of files",
" --zisofs-version-2 Enable processing of zisofs version 2 files", " --zisofs-version-2 Enable processing of zisofs version 2 files",
" --zisofs-susp-z2 Produce Z2 entries for version 2 instead of ZF", " --zisofs2-susp-z2 Produce Z2 entries for zisofs version 2",
" --zisofs2-susp-zf Produce ZF entries for zisofs version 2",
" -root DIR Set root directory for all new files and directories", " -root DIR Set root directory for all new files and directories",
" -old-root DIR Set root directory in previous session that is searched for files", " -old-root DIR Set root directory in previous session that is searched for files",
" --old-root-no-md5 Do not record and use MD5 with -old-root", " --old-root-no-md5 Do not record and use MD5 with -old-root",
@ -1605,8 +1607,10 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
Xorriso_option_zisofs(xorriso, "by_magic=on", 0); Xorriso_option_zisofs(xorriso, "by_magic=on", 0);
} else if(strcmp(argpt, "--zisofs-version-2") == 0) { } else if(strcmp(argpt, "--zisofs-version-2") == 0) {
Xorriso_option_zisofs(xorriso, "by_magic=v2", 0); Xorriso_option_zisofs(xorriso, "by_magic=v2", 0);
} else if(strcmp(argpt, "--zisofs-susp-z2") == 0) { } else if(strcmp(argpt, "--zisofs2-susp-z2") == 0) {
Xorriso_option_zisofs(xorriso, "susp_z2=on", 0); Xorriso_option_zisofs(xorriso, "susp_z2=on", 0);
} else if(strcmp(argpt, "--zisofs2-susp-zf") == 0) {
Xorriso_option_zisofs(xorriso, "susp_z2=off", 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;
@ -2041,7 +2045,8 @@ not_enough_args:;
} else if(strcmp(argpt, "-z")==0 || } else if(strcmp(argpt, "-z")==0 ||
strcmp(argpt, "-transparent-compression")==0 || strcmp(argpt, "-transparent-compression")==0 ||
strcmp(argpt, "--zisofs-version-2") == 0 || strcmp(argpt, "--zisofs-version-2") == 0 ||
strcmp(argpt, "--zisofs-susp-z2") == 0) { strcmp(argpt, "--zisofs2-susp-z2") == 0 ||
strcmp(argpt, "--zisofs2-susp-zf") == 0) {
/* was already handled in first argument scan */; /* was already handled in first argument scan */;
} else if(strcmp(argpt, "-U") == 0 || } else if(strcmp(argpt, "-U") == 0 ||
strcmp(argpt, "-untranslated-filenames") == 0) { strcmp(argpt, "-untranslated-filenames") == 0) {

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2020.10.29.083347" #define Xorriso_timestamP "2020.10.29.191346"

23
xorriso/xorrisofs.1
View File

@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISOFS 1 "Version 1.5.3, Oct 27, 2020" .TH XORRISOFS 1 "Version 1.5.3, Oct 29, 2020"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -270,20 +270,27 @@ Alias of \-z.
\fB\--zisofs-version-2\fR \fB\--zisofs-version-2\fR
.br .br
Enable the recognition and proper processing of experimental zisofs version 2 Enable the recognition and proper processing of experimental zisofs version 2
compressed files. The Linux kernel (as of 5.9) does not yet know this format compressed files.
and will complain like The Linux kernel (as of 5.9) does not yet know this format and will complain
like
.br .br
isofs: Unknown ZF compression algorithm: PZ isofs: Unknown ZF compression algorithm: PZ
.br .br
The files will then appear as they were submitted to xorriso, i.e. with zisofs2 This complaint can be prevented by option \-\-zisofs2\-susp\-z2 .
header, block pointer list, and compressed data. .br
The files will be shown by unaware kernels as they were submitted to xorriso,
i.e. with zisofs2 header, block pointer list, and compressed data.
.br .br
\-\-zisofs\-version\-2 also enables \-z. \-\-zisofs\-version\-2 also enables \-z.
.TP .TP
\fB\--zisofs-susp-z2\fR \fB\--zisofs2-susp-z2\fR
Enable the production of SUSP entries "Z2" instead of "ZF" with zisofs2 Enable the production of SUSP entries "Z2" instead of "ZF" with zisofs2
compressed files. Unaware Linux kernels are supposed to silently ignore "Z2" compressed files. Unaware Linux kernels silently ignore "Z2" entries.
entries. .TP
\fB\--zisofs2-susp-zf\fR
Enable the production of SUSP entries "ZF" instead of "Z2" with zisofs2
compressed files. Unaware Linux kernels complain about zisofs2 "ZF" by
"Unknown ZF compression algorithm" and thus leave a mark in the system log.
.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,

98
xorriso/xorrisofs.info
View File

@ -275,13 +275,20 @@ File: xorrisofs.info, Node: SetInsert, Next: SetProduct, Prev: Loading, Up:
version 2 compressed files. The Linux kernel (as of 5.9) does not version 2 compressed files. The Linux kernel (as of 5.9) does not
yet know this format and will complain like yet know this format and will complain like
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. This complaint can be prevented by option -zisofs2-susp-z2 .
with zisofs2 header, block pointer list, and compressed data. The files will be shown by unaware kernels as they were submitted
to xorriso, i.e. with zisofs2 header, block pointer list, and
compressed data.
-zisofs-version-2 also enables -z. -zisofs-version-2 also enables -z.
-zisofs-susp-z2 -zisofs2-susp-z2
Enable the production of SUSP entries "Z2" instead of "ZF" with Enable the production of SUSP entries "Z2" instead of "ZF" with
zisofs2 compressed files. Unaware Linux kernels are supposed to zisofs2 compressed files. Unaware Linux kernels silently ignore
silently ignore "Z2" entries. "Z2" entries.
-zisofs2-susp-zf
Enable the production of SUSP entries "ZF" instead of "Z2" with
zisofs2 compressed files. Unaware Linux kernels complain about
zisofs2 "ZF" by "Unknown ZF compression algorithm" and thus leave a
mark in the system log.
-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
@ -2007,10 +2014,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 97) (line 104)
* --old-root-no-ino disable disk ino with -old-root: SetInsert. * --old-root-no-ino disable disk ino with -old-root: SetInsert.
(line 86) (line 93)
* --old-root-no-md5 disable MD5 with -old-root: SetInsert. (line 104) * --old-root-no-md5 disable MD5 with -old-root: SetInsert. (line 111)
* --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.
@ -2026,10 +2033,12 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
(line 23) (line 23)
* --xattr Recording of any xattr: SetExtras. (line 116) * --xattr Recording of any xattr: SetExtras. (line 116)
* --xattr Recording of user xattr: SetExtras. (line 109) * --xattr Recording of user xattr: SetExtras. (line 109)
* --zisofs-susp-z2 produce Z2 for version 2 instead of ZF: SetInsert.
(line 64)
* --zisofs-version-2 enable recognition of zisofs2 files: SetInsert. * --zisofs-version-2 enable recognition of zisofs2 files: SetInsert.
(line 55) (line 55)
* --zisofs2-susp-z2 produce Z2 for version 2 instead of ZF: SetInsert.
(line 66)
* --zisofs2-susp-zf produce ZF for version 2 instead of Z2: SetInsert.
(line 70)
* -A set Application Id: ImageId. (line 34) * -A set Application Id: ImageId. (line 34)
* -abstract set Abstract File path: ImageId. (line 57) * -abstract set Abstract File path: ImageId. (line 57)
* -allow-lowercase lowercase in ISO file names: SetCompl. (line 42) * -allow-lowercase lowercase in ISO file names: SetCompl. (line 42)
@ -2161,7 +2170,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 73) * -old-root enable incremental insertion: SetInsert. (line 80)
* -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)
@ -2193,7 +2202,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 68) * -root redirect ISO root directory: SetInsert. (line 75)
* -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)
@ -2341,12 +2350,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 86) (line 93)
* Incremental insertion, disable MD5, --old-root-no-md5: SetInsert. * Incremental insertion, disable MD5, --old-root-no-md5: SetInsert.
(line 104) (line 111)
* Incremental insertion, enable disk devno, --old-root-devno: SetInsert. * Incremental insertion, enable disk devno, --old-root-devno: SetInsert.
(line 97) (line 104)
* Incremental insertion, enable, -old-root: SetInsert. (line 73) * Incremental insertion, enable, -old-root: SetInsert. (line 80)
* 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)
@ -2374,7 +2383,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 68) * ISO root directory, redirect, -root: SetInsert. (line 75)
* 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)
@ -2445,7 +2454,10 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* xattr, record and load, --xattr-any: SetExtras. (line 116) * xattr, record and load, --xattr-any: SetExtras. (line 116)
* xorriso, mkisofs emulation: Xorriso. (line 6) * xorriso, mkisofs emulation: Xorriso. (line 6)
* xorriso, options: Options. (line 6) * xorriso, options: Options. (line 6)
* Z2 instead of ZF for version 2, -zisofs-susp-z2: SetInsert. (line 64) * Z2 instead of ZF for version 2, -zisofs2-susp-z2: SetInsert.
(line 66)
* ZF instead of Z2 for version 2, -zisofs2-susp-zf: SetInsert.
(line 70)
* zisofs file, enable recognition, -z, -transparent-compression: SetInsert. * zisofs file, enable recognition, -z, -transparent-compression: SetInsert.
(line 47) (line 47)
* zisofs2 file, enable recognition, -zisofs-version-2: SetInsert. * zisofs2 file, enable recognition, -zisofs-version-2: SetInsert.
@ -2462,30 +2474,30 @@ Node: Xorriso5616
Node: Options6762 Node: Options6762
Node: Loading7489 Node: Loading7489
Node: SetInsert9530 Node: SetInsert9530
Node: SetProduct14570 Node: SetProduct14900
Node: SetCompl20141 Node: SetCompl20471
Node: SetExtras22733 Node: SetExtras23063
Node: SetHide34342 Node: SetHide34672
Node: ImageId35646 Node: ImageId35976
Node: Bootable39928 Node: Bootable40258
Node: SystemArea46214 Node: SystemArea46544
Node: Charset64563 Node: Charset64893
Node: Jigdo65588 Node: Jigdo65918
Node: Miscellaneous70558 Node: Miscellaneous70888
Node: Examples72203 Node: Examples72533
Node: ExSimple72697 Node: ExSimple73027
Node: ExGraft73180 Node: ExGraft73510
Node: ExMkisofs74480 Node: ExMkisofs74810
Node: ExGrowisofs76288 Node: ExGrowisofs76618
Node: ExIncBackup77478 Node: ExIncBackup77808
Node: ExIncBckAcc80654 Node: ExIncBckAcc80984
Node: ExBootable82359 Node: ExBootable82689
Node: Files86541 Node: Files86871
Node: Environ87636 Node: Environ87966
Node: Seealso88509 Node: Seealso88839
Node: Bugreport89160 Node: Bugreport89490
Node: Legal89753 Node: Legal90083
Node: CommandIdx90650 Node: CommandIdx90980
Node: ConceptIdx107287 Node: ConceptIdx107762
 
End Tag Table End Tag Table

29
xorriso/xorrisofs.texi
View File

@ -50,7 +50,7 @@
@c man .\" First parameter, NAME, should be all caps @c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@c man .\" other parameters are allowed: see man(7), man(1) @c man .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISOFS 1 "Version 1.5.3, Oct 27, 2020" @c man .TH XORRISOFS 1 "Version 1.5.3, Oct 29, 2020"
@c man .\" Please adjust this date whenever revising the manpage. @c man .\" Please adjust this date whenever revising the manpage.
@c man .\" @c man .\"
@c man .\" Some roff macros, for reference: @c man .\" Some roff macros, for reference:
@ -429,22 +429,31 @@ Alias of -z.
@cindex zisofs2 file, enable recognition, --zisofs-version-2 @cindex zisofs2 file, enable recognition, --zisofs-version-2
@* @*
Enable the recognition and proper processing of experimental zisofs version 2 Enable the recognition and proper processing of experimental zisofs version 2
compressed files. The Linux kernel (as of 5.9) does not yet know this format compressed files.
and will complain like The Linux kernel (as of 5.9) does not yet know this format and will complain
like
@* @*
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. with zisofs2 This complaint can be prevented by option --zisofs2-susp-z2 .
header, block pointer list, and compressed data. @*
The files will be shown by unaware kernels as they were submitted to xorriso,
i.e. with zisofs2 header, block pointer list, and compressed data.
@* @*
--zisofs-version-2 also enables -z. --zisofs-version-2 also enables -z.
@c man .TP @c man .TP
@item --zisofs-susp-z2 @item --zisofs2-susp-z2
@kindex --zisofs-susp-z2 produce Z2 for version 2 instead of ZF @kindex --zisofs2-susp-z2 produce Z2 for version 2 instead of ZF
@cindex Z2 instead of ZF for version 2, --zisofs-susp-z2 @cindex Z2 instead of ZF for version 2, --zisofs2-susp-z2
Enable the production of SUSP entries "Z2" instead of "ZF" with zisofs2 Enable the production of SUSP entries "Z2" instead of "ZF" with zisofs2
compressed files. Unaware Linux kernels are supposed to silently ignore "Z2" compressed files. Unaware Linux kernels silently ignore "Z2" entries.
entries. @c man .TP
@item --zisofs2-susp-zf
@kindex --zisofs2-susp-zf produce ZF for version 2 instead of Z2
@cindex ZF instead of Z2 for version 2, --zisofs2-susp-zf
Enable the production of SUSP entries "ZF" instead of "Z2" with zisofs2
compressed files. Unaware Linux kernels complain about zisofs2 "ZF" by
"Unknown ZF compression algorithm" and thus leave a mark in the system log.
@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