From 4f047c0cf6e72c45b9e09926e0c6cb35b84052f0 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 9 Mar 2008 21:11:00 +0000 Subject: [PATCH] Some polishing about -cut_out --- xorriso/xorriso.1 | 8 ++++---- xorriso/xorriso.c | 27 +++++++++++++++++++-------- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisoburn.c | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 2a8a25cf..ac2c818b 100644 --- a/xorriso/xorriso.1 +++ b/xorriso/xorriso.1 @@ -1321,7 +1321,7 @@ List size of directories and files in the local filesystem which match one of the patterns. Similar to shell command du -sk. .TP -\fB\-findx\fR disk_path [-name pattern] [-type t] -- +\fB\-findx\fR disk_path [-name pattern] [-type t] [-exec action [params]] -- Like -find but operating on local filesystem and not on the ISO image. This is subject to the settings of -follow. .br @@ -1337,20 +1337,20 @@ actions it will allways perform action "echo". the ISO image. For this the disk_path of the -find command gets replaced by iso_rr_path_start. E.g.: .br - -find /home -exec in_iso / + -findx /home -exec in_iso / .br "not_in_iso" iso_rr_path_start reports the path if its counterpart does not exist in the ISO image. The report format is the same as with command -compare. E.g. .br - -find /home/thomas -exec not_in_iso /thomas_on_cd + -findx /home/thomas -exec not_in_iso /thomas_on_cd .br "add_missing" iso_rr_path_start adds the counterpart if it does not yet exist in the ISO image. E.g. .br - -find /home/thomas -exec add_missing /thomas_on_cd + -findx /home/thomas -exec add_missing /thomas_on_cd .br "is_full_in_iso" iso_rr_path_start reports if the counterpart in the ISO image contains files. To be used with -type "m" to report mount points. diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c index 34ec2769..6765a510 100644 --- a/xorriso/xorriso.c +++ b/xorriso/xorriso.c @@ -8776,6 +8776,9 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) "Options marked by [***] have variable argument length and perform pattern", "expansion if enabled by -iso_rr_pattern resp. -disk_pattern.", "", +" -pathspecs \"on\"|\"off\" Allow or disallow pathspecs of form ", +" iso_rr_path=disk_path . Only \"off\" allows eventual", +" -disk_pattern expansion.", " -add pathspec [...] | disk_path [***]", " Insert the given files or directory trees from", " filesystem into the ISO image. Much like mkisofs.", @@ -8783,17 +8786,19 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " Whether to add lonely arguments as pathspec resp. disk_path.", " -path-list disk_path", " Like -add but read the pathspecs from file disk_path.", -" -pathspecs \"on\"|\"off\" Allow or disallow pathspecs of form ", -" iso_rr_path=disk_path . Only \"off\" allows eventual", -" -disk_pattern expansion.", "", " -update disk_path iso_rr_path", " Compare both file objects and do what is necessary to make", " iso_rr_path a matching copy of disk_path.", -"", +" -update_r disk_path iso_rr_path", +" Like -update but affecting all files below directories.", " -cpr disk_path [...] iso_rr_path", " Insert the given files or directory trees from filesystem", " into the ISO image.", +" -cut_out disk_path byte_offset byte_count iso_rr_path", +" Map a byte interval of a regular disk file into a regular", +" file in the ISO image.", +"", " -rm iso_rr_path [***]", " Delete the given files from the ISO image.", " -rm_r iso_rr_path [***]", @@ -8827,8 +8832,9 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " processed. Types: block,char,dir,pipe,file,link,socket.", " action may be one of: echo, chown, chown_r, chgrp, chgrp_r", " chmod, chmod_r, alter_date, alter_date_r, lsdl, compare,", -" find. params are their arguments except iso_rr_path.", -" I.e. echo and lsdl have no params at all.", +" rm, rm_r, compare, update, find.", +" params are their arguments except iso_rr_path.", +" I.e. echo, lsdl, rm, rm_r have no params at all.", " -mkdir iso_rr_path [...]", " Create empty directories if they do not exist yet.", " -rmdir iso_rr_path [***]", @@ -8913,8 +8919,11 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " -dusx pattern [***] like -dux but summing up subdirectories without", " listing them explicitely.", "", -" -findx disk_path [-name pattern] like -find but in local filesystem.", -" Any -exec option is ignored. Action is always echo.", +" -findx disk_path [-name pattern] [-type t] [-exec action [params]]", +" Like -find but operating on local filesystem. Most -exec", +" actions are defaulted to action is always echo. Supported", +" actions are: in_iso, not_in_iso, is_full_in_iso,", +" add_missing, empty_iso_dir.", "", " -compare disk_path iso_rr_path", " compare attributes and in case of regular data files the", @@ -8989,6 +8998,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " Print a text to result channel.", " -prompt text", " Wait for Enter key resp. for a line of input at stdin.", +" -errfile_log mode path|channel", +" Log disk paths of files involved in problem events.", " # any text Is ignored. In dialog mode the input line will be stored in", " the eventual readline history, nevertheless.", " -version Tell program and version number", diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 39b5580f..da1477ad 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.03.09.142200" +#define Xorriso_timestamP "2008.03.09.211041" diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c index 5d27cb12..d18ea703 100644 --- a/xorriso/xorrisoburn.c +++ b/xorriso/xorrisoburn.c @@ -2128,7 +2128,7 @@ int Xorriso_cut_out(struct XorrisO *xorriso, char *disk_path, } else { unsupported_type:; Xorriso_msgs_submit(xorriso, 0, eff_source, 0, "ERRFILE", 0); - sprintf(xorriso->info_text, "-cut_out: Unsupported file type %s with %s", + sprintf(xorriso->info_text, "-cut_out: Unsupported file type (%s) with %s", Ftypetxt(stbuf.st_mode, 0), Text_shellsafe(eff_source, sfe, 0)); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0); return(0);