From 3b64dc42280bf8a04483bd6bd5097d2a846f685d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 27 Jan 2008 17:46:04 +0000 Subject: [PATCH] Changed meaning of -add relative/path --- libisoburn/trunk/xorriso/xorriso.1 | 17 +++++++++++------ libisoburn/trunk/xorriso/xorriso.c | 3 +++ libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index bb809e5c..0922c4b7 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.1 @@ -2,7 +2,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 "January 25, 2008" +.TH XORRISO 1 "January 27, 2008" .\" Please adjust this date whenever revising the manpage. .\" .\" 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. .br 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, -not -cd. +If in this case the word does not begin with '/' then -cdx is prepended to +the disk_path and -cd is prepended to the iso_rr_path. .br 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 --cdx gets prepended. +-cdx gets prepended to disk_path and -cd to iso_rr_path. .TP \fB\-add_plainly\fR mode 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. .br 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 \fB\-rm\fR iso_rr_path [***] Delete the given files from the ISO image. @@ -1038,10 +1041,12 @@ subtracting already foreseeable consumption by next -commit. .TP \fB\-cd\fR iso_rr_path 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 \fB\-cdx\fR disk_path Change the current working directory on filesystem. +To be prepended to disk_paths which do not begin with '/'. .TP \fB\-pwd\fR .br diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c index 22baba90..30645dcc 100644 --- a/libisoburn/trunk/xorriso/xorriso.c +++ b/libisoburn/trunk/xorriso/xorriso.c @@ -6012,11 +6012,14 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv, } *wpt= 0; } + +/* <<< do not apply wdx to both if(source[0]!='/') { ret= Sfile_prepend_path(xorriso->wdx, source, 0); if(ret<=0) goto problem_handler; } +*/ if(split==0) { strcpy(target, source); } else if(target[0]!='/') { diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 44925778..216a2653 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.01.26.171156" +#define Xorriso_timestamP "2008.01.27.174454"