Bug fix: -as mkisofs did not unescape "\=" in the source part of pathspecs

This commit is contained in:
2015-12-09 13:28:06 +00:00
parent 4b4bf14b05
commit bafcf288f9
10 changed files with 300 additions and 169 deletions

View File

@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "Version 1.4.3, Nov 29, 2015"
.TH XORRISO 1 "Version 1.4.3, Dec 08, 2015"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -1150,13 +1150,21 @@ Default is "ls".
Insert the given files or directory trees from filesystem
into the ISO image.
.br
If \-pathspecs is set to "on" then pattern expansion is always disabled and
character '=' has a special meaning. It separates the ISO image path
from the disk path:
If \-pathspecs is set to "on" or "as_mkisofs" then pattern expansion is always
disabled and character '=' has a special meaning. It separates the ISO image
path from the disk path:
.br
iso_rr_path=disk_path
.br
The separator '=' can be escaped by '\\'.
Character '=' in the iso_rr_path must be escaped by '\\' (i.e. as "\\=").
.br
With \-pathspecs "on", the character '\\' must not be escaped. The character '='
in the disk_path must not be escaped.
.br
With \-pathspecs "as_mkisofs", all characters '\\' must be escaped in both,
iso_rr_path and disk_path. The character '=' may or may not be escaped
in the disk_path.
.br
If iso_rr_path does not begin with '/' then \-cd is prepended.
If disk_path does not begin with '/' then \-cdx is prepended.
.br
@ -1462,16 +1470,26 @@ cause exponential workload before their loops get detected.
The number given with "limit=" can curb this workload at the risk of truncating
an intentional sequence of link hops.
.TP
\fB\-pathspecs\fR "on"|"off"
\fB\-pathspecs\fR "on"|"off"|"as_mkisofs"
Control parameter interpretation with \fBxorriso\fR
actions \-add and \-path_list.
.br
"on" enables pathspecs of the form
\fBtarget=source\fR
like with program mkisofs \-graft\-points.
It also disables \-disk_pattern expansion for command \-add.
Mode "as_mkisofs" enables pathspecs of the form
.br
"off" disables pathspecs of the form target=source
\fBiso_rr_path=disk_path\fR
.br
like with program mkisofs \-graft\-points.
.br
All characters '\\' must be escaped in both, iso_rr_path and disk_path.
The character '=' must be escaped in the iso_rr_path and
may or may not be escaped in the disk_path.
This mode temporarily disables \-disk_pattern expansion for command \-add.
.br
Mode "on" does nearly the same. But '=' must only be escaped in the iso_rr_path
and '\\' must not be escaped at all. This has the disadvantage that one
cannot express an iso_rr_path which ends by '\\'.
.br
Mode "off" disables pathspecs of the form target=source
and re\-enables \-disk_pattern expansion.
.TP
\fB\-overwrite\fR "on"|"nondir"|"off"