From f0316cebf7949b2d6fb24c82db6d4702ec235b08 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 7 Apr 2011 17:59:31 +0000 Subject: [PATCH] Clarification about -as mkisofs pathspecs --- libisoburn/trunk/xorriso/xorrisofs.1 | 16 ++++-- libisoburn/trunk/xorriso/xorrisofs.info | 69 +++++++++++++------------ libisoburn/trunk/xorriso/xorrisofs.texi | 16 ++++-- 3 files changed, 59 insertions(+), 42 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index 77e3af39..d335d25e 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.1 +++ b/libisoburn/trunk/xorriso/xorrisofs.1 @@ -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 XORRISOFS 1 "Mar 26, 2011" +.TH XORRISOFS 1 "Apr 07, 2011" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -92,14 +92,15 @@ confuse with the lowlevel ISO 9660 names visible if Rock Ridge gets ignored.) A program argument is handled as a \fBpathspec\fR, if it is not recognized as original mkisofs option or additional xorrisofs option. A pathspec depicts an input file object by a disk_path. -If option -graft-points is not present, then this file object gets -copied into the /-directory of the ISO image. +If option -graft-points is not present, then the behavior depends on the +file type of disk_path. Directories get merged with the /-directory of the +ISO image. Files of other types get copied into the /-directory. .br If -graft-points is present then each pathspec gets split at the first occurence of the =-character. -The part before the = is taken as \fBtarget\fR, the iso_rr_path for +The part before the = is taken as \fBtarget\fR, i.e. the iso_rr_path for the file object in the ISO image. The part after the first = is taken -as \fBsource\fR, the disk_path of the input object. +as \fBsource\fR, i.e. the disk_path of the input object. .br It is possible to make =-characters part of the iso_rr_path by preceeding them with a \\-character. The same must be done for \\-characters which @@ -110,6 +111,11 @@ If the source part of the pathspec leads to a directory, then all files underneath this directory get inserted into the image, too. It is possible to exclude particular files from being inserted by help of option -m. +.br +In case that target already exists, the following rules apply: +Directories and other files may overwrite existing non-directories. +Directories get merged with existing directories. +Non-directories may not overwrite existing directories. .SS \fBRelation to program xorriso:\fR .br diff --git a/libisoburn/trunk/xorriso/xorrisofs.info b/libisoburn/trunk/xorriso/xorrisofs.info index a8777ba8..09a44a11 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.info +++ b/libisoburn/trunk/xorriso/xorrisofs.info @@ -95,13 +95,14 @@ Ridge gets ignored.) A program argument is handled as a *pathspec*, if it is not recognized as original mkisofs option or additional xorrisofs option. A pathspec depicts an input file object by a disk_path. If option -graft-points -is not present, then this file object gets copied into the /-directory -of the ISO image. +is not present, then the behavior depends on the file type of +disk_path. Directories get merged with the /-directory of the ISO +image. Files of other types get copied into the /-directory. If -graft-points is present then each pathspec gets split at the first occurence of the =-character. The part before the = is taken as -*target*, the iso_rr_path for the file object in the ISO image. The -part after the first = is taken as *source*, the disk_path of the input -object. +*target*, i.e. the iso_rr_path for the file object in the ISO image. +The part after the first = is taken as *source*, i.e. the disk_path of +the input object. It is possible to make =-characters part of the iso_rr_path by preceeding them with a \-character. The same must be done for \-characters which shall be part of the iso_rr_path. @@ -110,6 +111,10 @@ If the source part of the pathspec leads to a directory, then all files underneath this directory get inserted into the image, too. It is possible to exclude particular files from being inserted by help of option -m. +In case that target already exists, the following rules apply: +Directories and other files may overwrite existing non-directories. +Directories get merged with existing directories. Non-directories may +not overwrite existing directories.  File: xorrisofs.info, Node: Xorriso, Next: Options, Prev: Insert, Up: Top @@ -1780,32 +1785,32 @@ Node: Top397 Node: Overview1052 Node: Standards1488 Node: Insert3163 -Node: Xorriso4584 -Node: Options5720 -Node: Loading6437 -Node: SetInsert8731 -Node: SetProduct13133 -Node: SetCompl16840 -Node: SetExtras19159 -Node: SetHide22031 -Node: ImageId23039 -Node: Bootable26543 -Node: SystemArea30623 -Node: Charset36983 -Node: Jigdo38008 -Node: Miscellaneous42289 -Node: Examples43462 -Node: ExSimple43948 -Node: ExGraft44427 -Node: ExMkisofs45674 -Node: ExGrowisofs46925 -Node: ExIncBackup48097 -Node: ExIncBckAcc51146 -Node: ExBootable52821 -Node: Files54920 -Node: Seealso55990 -Node: Legal56505 -Node: CommandIdx57301 -Node: ConceptIdx68634 +Node: Xorriso4932 +Node: Options6068 +Node: Loading6785 +Node: SetInsert9079 +Node: SetProduct13481 +Node: SetCompl17188 +Node: SetExtras19507 +Node: SetHide22379 +Node: ImageId23387 +Node: Bootable26891 +Node: SystemArea30971 +Node: Charset37331 +Node: Jigdo38356 +Node: Miscellaneous42637 +Node: Examples43810 +Node: ExSimple44296 +Node: ExGraft44775 +Node: ExMkisofs46022 +Node: ExGrowisofs47273 +Node: ExIncBackup48445 +Node: ExIncBckAcc51494 +Node: ExBootable53169 +Node: Files55268 +Node: Seealso56338 +Node: Legal56853 +Node: CommandIdx57649 +Node: ConceptIdx68982  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index 63c0c39d..007bd044 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.texi +++ b/libisoburn/trunk/xorriso/xorrisofs.texi @@ -44,7 +44,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 XORRISOFS 1 "Mar 26, 2011" +@c man .TH XORRISOFS 1 "Apr 07, 2011" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -182,14 +182,15 @@ confuse with the lowlevel ISO 9660 names visible if Rock Ridge gets ignored.) A program argument is handled as a @strong{pathspec}, if it is not recognized as original mkisofs option or additional xorrisofs option. A pathspec depicts an input file object by a disk_path. -If option -graft-points is not present, then this file object gets -copied into the /-directory of the ISO image. +If option -graft-points is not present, then the behavior depends on the +file type of disk_path. Directories get merged with the /-directory of the +ISO image. Files of other types get copied into the /-directory. @* If -graft-points is present then each pathspec gets split at the first occurence of the =-character. -The part before the = is taken as @strong{target}, the iso_rr_path for +The part before the = is taken as @strong{target}, i.e. the iso_rr_path for the file object in the ISO image. The part after the first = is taken -as @strong{source}, the disk_path of the input object. +as @strong{source}, i.e. the disk_path of the input object. @* It is possible to make =-characters part of the iso_rr_path by preceeding them with a \-character. The same must be done for \-characters which @@ -201,6 +202,11 @@ If the source part of the pathspec leads to a directory, then all files underneath this directory get inserted into the image, too. It is possible to exclude particular files from being inserted by help of option -m. +@* +In case that target already exists, the following rules apply: +Directories and other files may overwrite existing non-directories. +Directories get merged with existing directories. +Non-directories may not overwrite existing directories. @c man .SS @node Xorriso, Options, Insert, Top @chapter Relation to program xorriso