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

Changed meaning of -add relative/path

Browse Source
This commit is contained in:
Thomas Schmitt 2008-01-27 17:46:04 +00:00
parent 76ed06fe60
commit 9af078f81a
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xorriso/xorriso.1
View File

@ -2,7 +2,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 XORRISO 1 "January 25, 2008" .TH XORRISO 1 "January 27, 2008"
.\" 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:
@ -510,12 +510,12 @@ If iso_rr_path does not begin with '/' then -cd is prepended.
If disk_path does not begin with '/' then -cdx is prepended. If disk_path does not begin with '/' then -cdx is prepended.
.br .br
If no '=' is given then the word is used as both, iso_rr_path and disk path. If no '=' is given then the word is used as both, iso_rr_path and disk path.
If in this case the word does not begin with '/' then -cdx is prepended, If in this case the word does not begin with '/' then -cdx is prepended to
not -cd. the disk_path and -cd is prepended to the iso_rr_path.
.br .br
If -pathspecs is set to "off" then eventual -disk_pattern expansion applies. If -pathspecs is set to "off" then eventual -disk_pattern expansion applies.
The resulting words are used as both, iso_rr_path and disk path. Eventually The resulting words are used as both, iso_rr_path and disk path. Eventually
-cdx gets prepended. -cdx gets prepended to disk_path and -cd to iso_rr_path.
.TP .TP
\fB\-add_plainly\fR mode \fB\-add_plainly\fR mode
If set to mode "unknown" then any command word that does not begin with "-" and If set to mode "unknown" then any command word that does not begin with "-" and
@ -548,7 +548,10 @@ The leafnames of the multiple disk_paths will be grafted under that
directory as would be done with an existing directory. directory as would be done with an existing directory.
.br .br
If a single disk_path is present then a non-existing iso_rr_path will If a single disk_path is present then a non-existing iso_rr_path will
have the same type as the disk_path. get the same type as the disk_path.
.br
If a disk_path does not begin with '/' then -cdx is prepended.
If the iso_rr_path does not begin with '/' then -cd is prepended.
.TP .TP
\fB\-rm\fR iso_rr_path [***] \fB\-rm\fR iso_rr_path [***]
Delete the given files from the ISO image. Delete the given files from the ISO image.
@ -1038,10 +1041,12 @@ subtracting already foreseeable consumption by next -commit.
.TP .TP
\fB\-cd\fR iso_rr_path \fB\-cd\fR iso_rr_path
Change the current working directory in the emerging ISO Change the current working directory in the emerging ISO
image as it is at the moment. image as it is at the moment. This typically is prepended to iso_rr_paths
which do not begin with '/'.
.TP .TP
\fB\-cdx\fR disk_path \fB\-cdx\fR disk_path
Change the current working directory on filesystem. Change the current working directory on filesystem.
To be prepended to disk_paths which do not begin with '/'.
.TP .TP
\fB\-pwd\fR \fB\-pwd\fR
.br .br

3
xorriso/xorriso.c
View File

@ -6012,11 +6012,14 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
} }
*wpt= 0; *wpt= 0;
} }
/* <<< do not apply wdx to both
if(source[0]!='/') { if(source[0]!='/') {
ret= Sfile_prepend_path(xorriso->wdx, source, 0); ret= Sfile_prepend_path(xorriso->wdx, source, 0);
if(ret<=0) if(ret<=0)
goto problem_handler; goto problem_handler;
} }
*/
if(split==0) { if(split==0) {
strcpy(target, source); strcpy(target, source);
} else if(target[0]!='/') { } else if(target[0]!='/') {

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.01.26.171156" #define Xorriso_timestamP "2008.01.27.174454"