diff --git a/libisoburn/trunk/libisoburn/libisoburn.ver b/libisoburn/trunk/libisoburn/libisoburn.ver index 89d518c5..9b3573d6 100644 --- a/libisoburn/trunk/libisoburn/libisoburn.ver +++ b/libisoburn/trunk/libisoburn/libisoburn.ver @@ -230,6 +230,7 @@ Xorriso_option_md5; Xorriso_option_mkdiri; Xorriso_option_mount; Xorriso_option_mount_opts; +Xorriso_option_move; Xorriso_option_msg_op; Xorriso_option_mvi; Xorriso_option_no_rc; diff --git a/libisoburn/trunk/xorriso/opts_d_h.c b/libisoburn/trunk/xorriso/opts_d_h.c index 6524110d..9be36d09 100644 --- a/libisoburn/trunk/xorriso/opts_d_h.c +++ b/libisoburn/trunk/xorriso/opts_d_h.c @@ -1738,8 +1738,12 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " Delete the given files from the ISO image.", " -rm_r iso_rr_path [***]", " Delete the given directory trees from ISO image.", +" -move iso_rr_path iso_rr_path", +" Rename the single file given by the first iso_rr_path to", +" the second iso_rr_path.", " -mv iso_rr_path [***] iso_rr_path", -" Rename the given file objects in the ISO tree to iso_rr_path.", +" Like shell command mv rename the given file objects in the", +" ISO tree to the last of the iso_rr_path parameters.", " -chown uid iso_rr_path [***]", " Equivalent to chown in the ISO image.", " -chown_r uid iso_rr_path [***]", diff --git a/libisoburn/trunk/xorriso/opts_i_o.c b/libisoburn/trunk/xorriso/opts_i_o.c index 5923e696..0cc3798f 100644 --- a/libisoburn/trunk/xorriso/opts_i_o.c +++ b/libisoburn/trunk/xorriso/opts_i_o.c @@ -866,6 +866,33 @@ unknown_mode:; } +/* Command -move */ +int Xorriso_option_move(struct XorrisO *xorriso, char *origin, char *dest, + int flag) +{ + int ret; + char *eff_origin= NULL, *eff_dest= NULL; + + Xorriso_alloc_meM(eff_origin, char, SfileadrL); + Xorriso_alloc_meM(eff_dest, char, SfileadrL); + + ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, origin, eff_origin, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, dest, eff_dest, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_rename(xorriso, NULL, eff_origin, eff_dest, 0); + if(ret <= 0) + goto ex; + ret= 1; +ex:; + Xorriso_free_meM(eff_origin); + Xorriso_free_meM(eff_dest); + return(ret); +} + + /* Command -msg_op */ int Xorriso_option_msg_op(struct XorrisO *xorriso, char *what, char *arg, int flag) diff --git a/libisoburn/trunk/xorriso/parse_exec.c b/libisoburn/trunk/xorriso/parse_exec.c index 6c07cdaf..b6afa63b 100644 --- a/libisoburn/trunk/xorriso/parse_exec.c +++ b/libisoburn/trunk/xorriso/parse_exec.c @@ -529,7 +529,7 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv, "data_cache_size", "errfile_log","error_behavior","extract","extract_single", "jigdo","lns","lnsi","load","logfile", - "map","map_single","msg_op","page","return_with", + "map","map_single","move","msg_op","page","return_with", "scdbackup_tag","update","update_r","volume_date", "" }; @@ -684,7 +684,7 @@ int Xorriso_cmd_sorting_rank(struct XorrisO *xorriso, "* File manipulations:", "iso_rr_pattern", - "rm", "rm_r", "rmdir", "mv", + "rm", "rm_r", "rmdir", "move", "mv", "chown", "chown_r", "chgrp", "chgrp_r", "chmod", "chmod_r", "setfacl", "setfacl_r", "setfacl_list", "setfattr", "setfattr_r", "setfattr_list", "alter_date", "alter_date_r", "hide", @@ -1446,6 +1446,10 @@ next_command:; (*idx)++; ret= Xorriso_option_mount_opts(xorriso, arg1, 0); + } else if(strcmp(cmd, "move")==0) { + (*idx)+= 2; + ret= Xorriso_option_move(xorriso, arg1, arg2, 0); + } else if(strcmp(cmd,"msg_op") == 0) { (*idx)+= 2; ret= Xorriso_option_msg_op(xorriso, arg1, arg2, 0); diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index d13eedf2..b4fcd46c 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.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 XORRISO 1 "Version 1.2.7, Mar 12, 2013" +.TH XORRISO 1 "Version 1.2.7, Mar 13, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1013,7 +1013,7 @@ decides. Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then \-mv inserts the source objects into this directory rather than attempting -to replace it. +to replace it. Command \-move, on the other hand, would attempt to replace it. .PP The commands in this section alter the ISO image and not the local filesystem. .TP @@ -1438,6 +1438,13 @@ See also the note with command \-rm. \fB\-rmdir\fR iso_rr_path [***] Delete empty directories. .TP +\fB\-move\fR iso_rr_path iso_rr_path +Rename the file given by the first (origin) iso_rr_path to the second +(destination) iso_rr_path. +Deviate from rules of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will rather replace such a +directory, if this is allowed by command \-overwrite. +.TP \fB\-mv\fR iso_rr_path [***] iso_rr_path Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. diff --git a/libisoburn/trunk/xorriso/xorriso.h b/libisoburn/trunk/xorriso/xorriso.h index 9682e657..5bea8c54 100644 --- a/libisoburn/trunk/xorriso/xorriso.h +++ b/libisoburn/trunk/xorriso/xorriso.h @@ -1639,6 +1639,10 @@ int Xorriso_option_mount(struct XorrisO *xorriso, char *dev, char *adr_mode, /* Command -mount_opts option[:...] */ int Xorriso_option_mount_opts(struct XorrisO *xorriso, char *mode, int flag); +/* Command -move */ +int Xorriso_option_move(struct XorrisO *xorriso, char *origin, char *dest, + int flag); + /* Command -msg_op */ int Xorriso_option_msg_op(struct XorrisO *xorriso, char *what, char *arg, int flag); diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 5a89ec02..7f75d44c 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -942,7 +942,8 @@ types collide then the setting of command *-overwrite* decides. Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than -attempting to replace it. +attempting to replace it. Command -move, on the other hand, would +attempt to replace it. The commands in this section alter the ISO image and not the local filesystem. @@ -1318,6 +1319,13 @@ whether they stem from the loaded image or were newly inserted. -rmdir iso_rr_path [***] Delete empty directories. +-move iso_rr_path iso_rr_path + Rename the file given by the first (origin) iso_rr_path to the + second (destination) iso_rr_path. Deviate from rules of shell + command mv by not moving the origin file underneath an existing + destination directory. The origin file will rather replace such a + directory, if this is allowed by command -overwrite. + -mv iso_rr_path [***] iso_rr_path Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. @@ -4692,10 +4700,10 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -abort_on controls abort on error: Exception. (line 27) * -abstract_file sets abstract file name: SetWrite. (line 233) * -acl controls handling of ACLs: Loading. (line 143) -* -add inserts one or more paths: Insert. (line 45) -* -add_plainly inserts one or more paths: Insert. (line 64) -* -alter_date sets timestamps in ISO image: Manip. (line 147) -* -alter_date_r sets timestamps in ISO image: Manip. (line 173) +* -add inserts one or more paths: Insert. (line 46) +* -add_plainly inserts one or more paths: Insert. (line 65) +* -alter_date sets timestamps in ISO image: Manip. (line 154) +* -alter_date_r sets timestamps in ISO image: Manip. (line 180) * -append_partition adds arbitrary file after image end: Bootable. (line 234) * -application_id sets application id: SetWrite. (line 192) @@ -4716,13 +4724,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -check_md5_r verifies file tree checksums: Verify. (line 170) * -check_media reads media block by block: Verify. (line 21) * -check_media_defaults sets -check_media options: Verify. (line 41) -* -chgrp sets group in ISO image: Manip. (line 50) -* -chgrp_r sets group in ISO image: Manip. (line 55) -* -chmod sets permissions in ISO image: Manip. (line 58) -* -chmod_r sets permissions in ISO image: Manip. (line 70) -* -chown sets ownership in ISO image: Manip. (line 42) -* -chown_r sets ownership in ISO image: Manip. (line 47) -* -clone copies ISO directory tree: Insert. (line 179) +* -chgrp sets group in ISO image: Manip. (line 57) +* -chgrp_r sets group in ISO image: Manip. (line 62) +* -chmod sets permissions in ISO image: Manip. (line 65) +* -chmod_r sets permissions in ISO image: Manip. (line 77) +* -chown sets ownership in ISO image: Manip. (line 49) +* -chown_r sets ownership in ISO image: Manip. (line 54) +* -clone copies ISO directory tree: Insert. (line 180) * -close controls media closing: SetWrite. (line 335) * -close_damaged closes damaged track and session: Writing. (line 158) * -close_filter_list bans filter registration: Filter. (line 52) @@ -4733,19 +4741,19 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -compare_r reports ISO/disk differences: Navigate. (line 159) * -compliance controls standard compliance: SetWrite. (line 58) * -copyright_file sets copyright file name: SetWrite. (line 227) -* -cp_clone copies ISO directory tree: Insert. (line 191) +* -cp_clone copies ISO directory tree: Insert. (line 192) * -cp_rx copies file trees to disk: Restore. (line 111) * -cpax copies files to disk: Restore. (line 107) -* -cpr inserts like with cp -r: Insert. (line 155) +* -cpr inserts like with cp -r: Insert. (line 156) * -cpx copies files to disk: Restore. (line 95) -* -cut_out inserts piece of data file: Insert. (line 129) +* -cut_out inserts piece of data file: Insert. (line 130) * -data_cache_size adjusts read cache size: Loading. (line 269) * -dev acquires one drive for input and output: AqDrive. (line 12) * -device_links gets list of drives: Inquiry. (line 18) * -devices gets list of drives: Inquiry. (line 7) * -dialog enables dialog mode: DialogCtl. (line 7) * -disk_dev_ino fast incremental backup: Loading. (line 190) -* -disk_pattern controls pattern expansion: Insert. (line 34) +* -disk_pattern controls pattern expansion: Insert. (line 35) * -displacement compensate altered image start address: Loading. (line 36) * -drive_class controls drive accessability: Loading. (line 54) @@ -4782,7 +4790,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -hardlinks controls handling of hard links: Loading. (line 110) * -help prints help text: Scripting. (line 20) * -hfsplus enables production of HFS+ partition: SetWrite. (line 14) -* -hide excludes file names from directory trees: Manip. (line 177) +* -hide excludes file names from directory trees: Manip. (line 184) * -history brings text into readline history: Scripting. (line 44) * -in_charset sets input character set: Loading. (line 92) * -indev acquires a drive for input: AqDrive. (line 24) @@ -4798,7 +4806,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -list_formats lists available formats: Writing. (line 129) * -list_profiles lists supported media: Writing. (line 172) * -list_speeds lists available write speeds: Writing. (line 141) -* -lns creates ISO symbolic link: Insert. (line 174) +* -lns creates ISO symbolic link: Insert. (line 175) * -load addresses a particular session as input: Loading. (line 11) * -local_charset sets terminal character set: Charset. (line 47) * -logfile logs output channels to file: Frontend. (line 20) @@ -4810,17 +4818,18 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -lsl lists files in ISO image: Navigate. (line 38) * -lslx lists files on disk: Navigate. (line 62) * -lsx lists files on disk: Navigate. (line 51) -* -map inserts path: Insert. (line 88) -* -map_l inserts paths from disk file: Insert. (line 97) -* -map_single inserts path: Insert. (line 93) +* -map inserts path: Insert. (line 89) +* -map_l inserts paths from disk file: Insert. (line 98) +* -map_single inserts path: Insert. (line 94) * -mark sets synchronizing message: Frontend. (line 25) * -md5 controls handling of MD5 sums: Loading. (line 156) -* -mkdir creates ISO directory: Insert. (line 169) +* -mkdir creates ISO directory: Insert. (line 170) * -mount issues mount command for ISO session: Restore. (line 129) * -mount_cmd composes mount command line: Inquiry. (line 52) * -mount_cmd controls mount command: Inquiry. (line 68) * -msg_op perform operations on program messages: Frontend. (line 30) -* -mv renames file in ISO image: Manip. (line 35) +* -mv renames files in ISO image: Manip. (line 42) +* -mv renames single file in ISO image: Manip. (line 35) * -no_rc disables startup files: Scripting. (line 7) * -not_leaf sets exclusion pattern: SetInsert. (line 62) * -not_list sets exclusions from disk file: SetInsert. (line 67) @@ -4835,7 +4844,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -padding sets amount or mode of image padding: SetWrite. (line 349) * -page set terminal geometry: DialogCtl. (line 19) * -paste_in copies file into disk file: Restore. (line 124) -* -path_list inserts paths from disk file: Insert. (line 78) +* -path_list inserts paths from disk file: Insert. (line 79) * -pathspecs sets meaning of = with -add: SetInsert. (line 118) * -pkt_output consolidates text output: Frontend. (line 7) * -preparer_id sets preparer id: SetWrite. (line 246) @@ -4851,7 +4860,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -pwd tells working directory in ISO: Navigate. (line 20) * -pwdx tells working directory on disk: Navigate. (line 23) * -quoted_not_list sets exclusions: SetInsert. (line 72) -* -quoted_path_list inserts paths from disk file: Insert. (line 83) +* -quoted_path_list inserts paths from disk file: Insert. (line 84) * -read_mkisofsrc searches and reads .mkisofsrc file: Emulation. (line 151) * -reassure enables confirmation question: DialogCtl. (line 32) @@ -4873,12 +4882,12 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -session_string composes session info line: Inquiry. (line 78) * -set_filter applies filter to file: Filter. (line 60) * -set_filter_r applies filter to file tree: Filter. (line 89) -* -setfacl sets ACL in ISO image: Manip. (line 73) -* -setfacl_list sets ACL in ISO image: Manip. (line 101) -* -setfacl_r sets ACL in ISO image: Manip. (line 98) -* -setfattr sets xattr in ISO image: Manip. (line 111) -* -setfattr_list sets xattr in ISO image: Manip. (line 127) -* -setfattr_r sets xattr in ISO image: Manip. (line 124) +* -setfacl sets ACL in ISO image: Manip. (line 80) +* -setfacl_list sets ACL in ISO image: Manip. (line 108) +* -setfacl_r sets ACL in ISO image: Manip. (line 105) +* -setfattr sets xattr in ISO image: Manip. (line 118) +* -setfattr_list sets xattr in ISO image: Manip. (line 134) +* -setfattr_r sets xattr in ISO image: Manip. (line 131) * -show_stream shows data source and filters: Navigate. (line 169) * -show_stream_r shows data source and filters: Navigate. (line 183) * -signal_handling controls handling of system signals: Exception. @@ -4896,9 +4905,9 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -toc shows list of sessions: Inquiry. (line 28) * -toc_of shows list of sessions: Inquiry. (line 43) * -uid sets global ownership: SetWrite. (line 264) -* -update inserts path if different: Insert. (line 102) -* -update_l inserts paths if different: Insert. (line 124) -* -update_r inserts paths if different: Insert. (line 113) +* -update inserts path if different: Insert. (line 103) +* -update_l inserts paths if different: Insert. (line 125) +* -update_r inserts paths if different: Insert. (line 114) * -use_readline enables readline for dialog: DialogCtl. (line 28) * -version prints help text: Scripting. (line 23) * -volid sets volume id: SetWrite. (line 160) @@ -4921,9 +4930,9 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, _definition: Extras. (line 49) * ACL, control handling, -acl: Loading. (line 143) -* ACL, set in ISO image, -setfacl: Manip. (line 73) -* ACL, set in ISO image, -setfacl_list: Manip. (line 101) -* ACL, set in ISO image, -setfacl_r: Manip. (line 98) +* ACL, set in ISO image, -setfacl: Manip. (line 80) +* ACL, set in ISO image, -setfacl_list: Manip. (line 108) +* ACL, set in ISO image, -setfacl_r: Manip. (line 105) * ACL, show in ISO image, -getfacl: Navigate. (line 70) * ACL, show in ISO image, -getfacl_r: Navigate. (line 77) * APM block size: Bootable. (line 225) @@ -4962,9 +4971,9 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Dialog, enable dialog mode, -dialog: DialogCtl. (line 7) * Dialog, line editing, -use_readline: DialogCtl. (line 28) * Dialog, terminal geometry, -page: DialogCtl. (line 19) -* Directories, copy, -cp_clone: Insert. (line 191) -* Directory, copy, -clone: Insert. (line 179) -* Directory, create, -mkdir: Insert. (line 169) +* Directories, copy, -cp_clone: Insert. (line 192) +* Directory, copy, -clone: Insert. (line 180) +* Directory, create, -mkdir: Insert. (line 170) * Directory, delete, -rmdir: Manip. (line 32) * disk_path, _definition: Insert. (line 6) * Drive, _definition: Drives. (line 6) @@ -5005,13 +5014,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top (line 116) * GPT, _definition: Extras. (line 38) * Group, global in ISO image, -gid: SetWrite. (line 268) -* Group, in ISO image, -chgrp: Manip. (line 50) -* Group, in ISO image, -chgrp_r: Manip. (line 55) +* Group, in ISO image, -chgrp: Manip. (line 57) +* Group, in ISO image, -chgrp_r: Manip. (line 62) * Growing, _definition: Methods. (line 19) * Hard links, control handling, -hardlinks: Loading. (line 110) * HFS+ allocation block size: Bootable. (line 222) * HFS+ serial number: Bootable. (line 219) -* hidden, set in ISO image, -hide: Manip. (line 177) +* hidden, set in ISO image, -hide: Manip. (line 184) * Image reading, cache size, -data_cache_size: Loading. (line 269) * Image, _definition: Model. (line 9) * Image, demand volume ID, -assert_volid: Loading. (line 84) @@ -5034,22 +5043,22 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Insert, file exclusion pattern, -not_leaf: SetInsert. (line 62) * Insert, file exclusion, -not_mgt: SetInsert. (line 23) * Insert, file exclusion, -quoted_not_list: SetInsert. (line 72) -* Insert, if different, -update: Insert. (line 102) -* Insert, if different, -update_l: Insert. (line 124) -* Insert, if different, -update_r: Insert. (line 113) +* Insert, if different, -update: Insert. (line 103) +* Insert, if different, -update_l: Insert. (line 125) +* Insert, if different, -update_r: Insert. (line 114) * Insert, large file splitting, -split_size: SetInsert. (line 140) * Insert, limit data file size, -file_size_limit: SetInsert. (line 7) * Insert, links or mount points, -follow: SetInsert. (line 76) * Insert, meaning of = with -add, -pathspecs: SetInsert. (line 118) -* Insert, non-dashed arguments, -add_plainly: Insert. (line 64) -* Insert, path, -map: Insert. (line 88) -* Insert, path, -map_single: Insert. (line 93) -* Insert, paths from disk file, -map_l: Insert. (line 97) -* Insert, paths from disk file, -path_list: Insert. (line 78) -* Insert, paths from disk file, -quoted_path_list: Insert. (line 83) -* Insert, paths, -cpr: Insert. (line 155) -* Insert, pathspecs, -add: Insert. (line 45) -* Insert, piece of data file, -cut_out: Insert. (line 129) +* Insert, non-dashed arguments, -add_plainly: Insert. (line 65) +* Insert, path, -map: Insert. (line 89) +* Insert, path, -map_single: Insert. (line 94) +* Insert, paths from disk file, -map_l: Insert. (line 98) +* Insert, paths from disk file, -path_list: Insert. (line 79) +* Insert, paths from disk file, -quoted_path_list: Insert. (line 84) +* Insert, paths, -cpr: Insert. (line 156) +* Insert, pathspecs, -add: Insert. (line 46) +* Insert, piece of data file, -cut_out: Insert. (line 130) * ISO 9660, _definition: Model. (line 6) * iso_rr_path, _definition: Insert. (line 7) * Jigdo Template Extraction, -jigdo: Jigdo. (line 33) @@ -5086,16 +5095,16 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Next writeable address, -grow_blindly: AqDrive. (line 46) * Overwriteable media, _definition: Media. (line 14) * Ownership, global in ISO image, -uid: SetWrite. (line 264) -* Ownership, in ISO image, -chown: Manip. (line 42) -* Ownership, in ISO image, -chown_r: Manip. (line 47) +* Ownership, in ISO image, -chown: Manip. (line 49) +* Ownership, in ISO image, -chown_r: Manip. (line 54) * Partition offset, _definition: Bootable. (line 167) * Partition table, _definition: Bootable. (line 128) * Pathspec, _definition: SetInsert. (line 120) * Pattern expansion, _definition: Processing. (line 24) -* Pattern expansion, for disk paths, -disk_pattern: Insert. (line 34) +* Pattern expansion, for disk paths, -disk_pattern: Insert. (line 35) * Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10) -* Permissions, in ISO image, -chmod: Manip. (line 58) -* Permissions, in ISO image, -chmod_r: Manip. (line 70) +* Permissions, in ISO image, -chmod: Manip. (line 65) +* Permissions, in ISO image, -chmod_r: Manip. (line 77) * PReP partition, _definition: Bootable. (line 152) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) @@ -5131,7 +5140,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Quoted input, _definition: Processing. (line 46) * Recovery, retrieve blocks, -check_media: Verify. (line 21) * Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 141) -* Rename, in ISO image, -mv: Manip. (line 35) +* Rename, in ISO image, -move: Manip. (line 35) +* Rename, in ISO image, -mv: Manip. (line 42) * Restore, copy file into disk file, -paste_in: Restore. (line 124) * Restore, copy file piece to disk, -extract_cut: Restore. (line 84) * Restore, copy file to disk, -extract_single: Restore. (line 75) @@ -5153,12 +5163,12 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) * SUN Disk Label, production: Bootable. (line 210) * SUN SPARC boot images, activation: Bootable. (line 255) -* Symbolic link, create, -lns: Insert. (line 174) +* Symbolic link, create, -lns: Insert. (line 175) * System area, _definition: Bootable. (line 121) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 211) * Table-of-content, show, -toc: Inquiry. (line 28) -* Timestamps, set in ISO image, -alter_date: Manip. (line 147) -* Timestamps, set in ISO image, -alter_date_r: Manip. (line 173) +* Timestamps, set in ISO image, -alter_date: Manip. (line 154) +* Timestamps, set in ISO image, -alter_date_r: Manip. (line 180) * Tree, disk, traverse, -findx: Navigate. (line 106) * Tree, ISO, traverse and alter, -find: CmdFind. (line 7) * Verify, check blocks, -check_media: Verify. (line 21) @@ -5189,9 +5199,9 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Write, TAO or SAO/DAO, -write_type: SetWrite. (line 341) * xattr, _definition: Extras. (line 65) * xattr, control handling, -xattr: Loading. (line 151) -* xattr, set in ISO image, -setfattr: Manip. (line 111) -* xattr, set in ISO image, -setfattr_list: Manip. (line 127) -* xattr, set in ISO image, -setfattr_r: Manip. (line 124) +* xattr, set in ISO image, -setfattr: Manip. (line 118) +* xattr, set in ISO image, -setfattr_list: Manip. (line 134) +* xattr, set in ISO image, -setfattr_r: Manip. (line 131) * xattr, show in ISO image, -getfattr: Navigate. (line 81) * xattr, show in ISO image, -getfattr_r: Navigate. (line 85) @@ -5212,46 +5222,46 @@ Node: ArgSort26158 Node: AqDrive27650 Node: Loading30695 Node: Insert46151 -Node: SetInsert56287 -Node: Manip64864 -Node: CmdFind74008 -Node: Filter88713 -Node: Writing93269 -Node: SetWrite102657 -Node: Bootable121408 -Node: Jigdo136802 -Node: Charset141049 -Node: Exception143811 -Node: DialogCtl149931 -Node: Inquiry152529 -Node: Navigate158607 -Node: Verify166905 -Node: Restore175937 -Node: Emulation183024 -Node: Scripting193148 -Node: Frontend200309 -Node: Examples208384 -Node: ExDevices209562 -Node: ExCreate210221 -Node: ExDialog211506 -Node: ExGrowing212771 -Node: ExModifying213576 -Node: ExBootable214080 -Node: ExCharset214632 -Node: ExPseudo215453 -Node: ExCdrecord216351 -Node: ExMkisofs216668 -Node: ExGrowisofs218008 -Node: ExException219143 -Node: ExTime219597 -Node: ExIncBackup220056 -Node: ExRestore224048 -Node: ExRecovery225008 -Node: Files225578 -Node: Seealso226877 -Node: Bugreport227600 -Node: Legal228181 -Node: CommandIdx229192 -Node: ConceptIdx245421 +Node: SetInsert56350 +Node: Manip64927 +Node: CmdFind74436 +Node: Filter89141 +Node: Writing93697 +Node: SetWrite103085 +Node: Bootable121836 +Node: Jigdo137230 +Node: Charset141477 +Node: Exception144239 +Node: DialogCtl150359 +Node: Inquiry152957 +Node: Navigate159035 +Node: Verify167333 +Node: Restore176365 +Node: Emulation183452 +Node: Scripting193576 +Node: Frontend200737 +Node: Examples208812 +Node: ExDevices209990 +Node: ExCreate210649 +Node: ExDialog211934 +Node: ExGrowing213199 +Node: ExModifying214004 +Node: ExBootable214508 +Node: ExCharset215060 +Node: ExPseudo215881 +Node: ExCdrecord216779 +Node: ExMkisofs217096 +Node: ExGrowisofs218436 +Node: ExException219571 +Node: ExTime220025 +Node: ExIncBackup220484 +Node: ExRestore224476 +Node: ExRecovery225436 +Node: Files226006 +Node: Seealso227305 +Node: Bugreport228028 +Node: Legal228609 +Node: CommandIdx229620 +Node: ConceptIdx245922  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 967a8010..f6a54fa6 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/xorriso/xorriso.texi @@ -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.2.7, Mar 12, 2013" +@c man .TH XORRISO 1 "Version 1.2.7, Mar 13, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1271,7 +1271,7 @@ decides. Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than attempting -to replace it. +to replace it. Command -move, on the other hand, would attempt to replace it. @c man .PP @sp 1 The commands in this section alter the ISO image and not the local filesystem. @@ -1773,8 +1773,17 @@ See also the note with command -rm. @cindex Directory, delete, -rmdir Delete empty directories. @c man .TP +@item -move iso_rr_path iso_rr_path +@kindex -mv renames single file in ISO image +@cindex Rename, in ISO image, -move +Rename the file given by the first (origin) iso_rr_path to the second +(destination) iso_rr_path. +Deviate from rules of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will rather replace such a +directory, if this is allowed by command -overwrite. +@c man .TP @item -mv iso_rr_path [***] iso_rr_path -@kindex -mv renames file in ISO image +@kindex -mv renames files in ISO image @cindex Rename, in ISO image, -mv Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index d4d30f15..a16c4add 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2013.03.12.195052" +#define Xorriso_timestamP "2013.03.13.195851"