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

@ -50,7 +50,7 @@
@c man .\" First parameter, NAME, should be all caps
@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 .TH XORRISO 1 "Version 1.4.3, Nov 29, 2015"
@c man .TH XORRISO 1 "Version 1.4.3, Dec 08, 2015"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
@ -1425,13 +1425,21 @@ Default is "ls".
Insert the given files or directory trees from filesystem
into the ISO image.
@*
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:
@*
iso_rr_path=disk_path
@*
The separator '=' can be escaped by '\'.
Character '=' in the iso_rr_path must be escaped by '\' (i.e. as "\=").
@*
With -pathspecs "on", the character '\' must not be escaped. The character '='
in the disk_path must not be escaped.
@*
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.
@*
If iso_rr_path does not begin with '/' then -cd is prepended.
If disk_path does not begin with '/' then -cdx is prepended.
@*
@ -1786,19 +1794,29 @@ 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.
@c man .TP
@item -pathspecs "on"|"off"
@item -pathspecs "on"|"off"|"as_mkisofs"
@kindex -pathspecs sets meaning of = with -add
@cindex Insert, meaning of = with -add, -pathspecs
Control parameter interpretation with @command{xorriso}
actions -add and -path_list.
@*
@cindex Pathspec, _definition
"on" enables pathspecs of the form
@strong{target=source}
like with program mkisofs -graft-points.
It also disables -disk_pattern expansion for command -add.
Mode "as_mkisofs" enables pathspecs of the form
@*
"off" disables pathspecs of the form target=source
@strong{iso_rr_path=disk_path}
@*
like with program mkisofs -graft-points.
@*
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.
@*
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 '\'.
@*
Mode "off" disables pathspecs of the form target=source
and re-enables -disk_pattern expansion.
@c man .TP
@item -overwrite "on"|"nondir"|"off"