diff --git a/xorriso/iso_manip.c b/xorriso/iso_manip.c index c1da8d52..77800e00 100644 --- a/xorriso/iso_manip.c +++ b/xorriso/iso_manip.c @@ -1601,7 +1601,7 @@ int Xorriso_overwrite_dest(struct XorrisO *xorriso, void *boss_iter, Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); return(0); } else if (dest_ret==1 && !xorriso->do_overwrite) { - sprintf(xorriso->info_text, "%s: May not overwite: ", activity); + sprintf(xorriso->info_text, "%s: May not overwrite: ", activity); Text_shellsafe(eff_dest, xorriso->info_text, 1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); return(0); diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c index 39b28a72..21fc744b 100644 --- a/xorriso/lib_mgt.c +++ b/xorriso/lib_mgt.c @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2014 Thomas Schmitt, + Copyright 2007-2016 Thomas Schmitt, Provided under GPL version 2 or later. @@ -526,7 +526,7 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag) ret= pthread_mutex_lock(&(xorriso->lib_msg_queue_lock)); if(ret != 0) { Xorriso_msgs_submit(xorriso, 0, - "Cannot aquire mutex lock for processing library message queues", + "Cannot acquire mutex lock for processing library message queues", ret, "FATAL", 0); } else locked= 1; diff --git a/xorriso/write_run.c b/xorriso/write_run.c index f4d16400..637b7c4d 100644 --- a/xorriso/write_run.c +++ b/xorriso/write_run.c @@ -2,7 +2,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2015 Thomas Schmitt, + Copyright 2007-2016 Thomas Schmitt, Provided under GPL version 2 or later. @@ -702,7 +702,7 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag) if(ret > 0) { if(!xorriso->do_overwrite) { sprintf(xorriso->info_text, - "May not overwite existing -boot_image ... cat_path="); + "May not overwrite existing -boot_image ... cat_path="); Text_shellsafe(xorriso->boot_image_cat_path, xorriso->info_text, 1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); {ret= 0; goto ex;} diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 5db62a21..7c5b7203 100644 --- a/xorriso/xorriso.1 +++ b/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.4.5, Jul 02, 2016" +.TH XORRISO 1 "Version 1.4.5, Jul 03, 2016" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -3375,7 +3375,7 @@ of type 0xee which covers the whole output data. .br \fBappended_part_as=mbr\fR is the default. Appended partitions get marked in GPT only if GPT is produced because of other settings. -If given explicitely, this clears setting "gpt" and "apm". Nevertheless "apm" +If given explicitly, this clears setting "gpt" and "apm". Nevertheless "apm" may be added to "mbr". .br \fBappended_part_as=apm\fR marks partitions from \-append_partition in APM @@ -3709,10 +3709,10 @@ The default output charset is the local character set of the terminal where \fBxorriso\fR runs. So by default no conversion happens between local filesystem names and emerging Rock Ridge names in the image. The situation stays -ambigous and the reader has to riddle what character set was used. +ambiguous and the reader has to riddle what character set was used. .br By command \-auto_charset it is possible to attribute the output charset name -to the image. This makes the situation unambigous. But if your terminal +to the image. This makes the situation unambiguous. But if your terminal character set does not match the character set of the local file names, then this attribute can become plainly wrong and cause problems at read time. To prevent this it is necessary to check whether the terminal properly @@ -4339,7 +4339,7 @@ correction will fail and the drive is supposed to indicate error. .br \fBxorriso\fR can scan a medium for readable data blocks, classify them according -to their read speed, save them to a file, and keep track of successfuly saved +to their read speed, save them to a file, and keep track of successfully saved blocks for further tries on the same medium. .br By command \-md5 checksums may get recorded with data files and whole @@ -5026,7 +5026,7 @@ prevent the wrapping of file addresses into quotation marks with commands \-pwd \-pwdx \-ls \-lsd \-lsl \-lsdl \-lsx \-lsdx \-lslx \-lsdlx \-du \-dus \-dux \-dusx \-findx \-find .br -This will make ambigous the representation of file names which contain +This will make ambiguous the representation of file names which contain newline characters. On the other hand it should facilitate integration of xorriso into shell scripts which already use the corresponding shell commands. diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index 235ea436..ce840fb3 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -2838,7 +2838,7 @@ Examples: partition of type 0xee which covers the whole output data. *appended_part_as=mbr* is the default. Appended partitions get marked in GPT only if GPT is produced because of other settings. - If given explicitely, this clears setting "gpt" and "apm". + If given explicitly, this clears setting "gpt" and "apm". Nevertheless "apm" may be added to "mbr". *appended_part_as=apm* marks partitions from -append_partition in APM additionally to "mbr" or "gpt". @@ -3117,10 +3117,10 @@ uses UTF-16. The default output charset is the local character set of the terminal where 'xorriso' runs. So by default no conversion happens between local filesystem names and emerging Rock Ridge names in the image. The -situation stays ambigous and the reader has to riddle what character set -was used. +situation stays ambiguous and the reader has to riddle what character +set was used. By command -auto_charset it is possible to attribute the output charset -name to the image. This makes the situation unambigous. But if your +name to the image. This makes the situation unambiguous. But if your terminal character set does not match the character set of the local file names, then this attribute can become plainly wrong and cause problems at read time. To prevent this it is necessary to check whether @@ -3632,7 +3632,7 @@ of read problems the correction will fail and the drive is supposed to indicate error. 'xorriso' can scan a medium for readable data blocks, classify them according to their read speed, save them to a file, and keep track of -successfuly saved blocks for further tries on the same medium. +successfully saved blocks for further tries on the same medium. By command -md5 checksums may get recorded with data files and whole sessions. These checksums are reachable only via indev and a loaded image. They work independently of the media type and can detect @@ -4207,7 +4207,7 @@ File: xorriso.info, Node: Scripting, Next: Frontend, Prev: Emulation, Up: Co important effect is to prevent the wrapping of file addresses into quotation marks with commands -pwd -pwdx -ls -lsd -lsl -lsdl -lsx -lsdx -lslx -lsdlx -du -dus -dux -dusx -findx -find - This will make ambigous the representation of file names which + This will make ambiguous the representation of file names which contain newline characters. On the other hand it should facilitate integration of xorriso into shell scripts which already use the corresponding shell commands. @@ -5655,39 +5655,39 @@ Node: Filter100698 Node: Writing105320 Node: SetWrite115477 Node: Bootable138521 -Node: Jigdo162315 -Node: Charset166574 -Node: Exception169901 -Node: DialogCtl176030 -Node: Inquiry178632 -Node: Navigate187082 -Node: Verify195377 -Node: Restore205254 -Node: Emulation213867 -Node: Scripting224277 -Node: Frontend232059 -Node: Examples241694 -Node: ExDevices242872 -Node: ExCreate243533 -Node: ExDialog244833 -Node: ExGrowing246104 -Node: ExModifying246913 -Node: ExBootable247423 -Node: ExCharset247978 -Node: ExPseudo248874 -Node: ExCdrecord249801 -Node: ExMkisofs250121 -Node: ExGrowisofs251478 -Node: ExException252632 -Node: ExTime253090 -Node: ExIncBackup253548 -Node: ExRestore257574 -Node: ExRecovery258520 -Node: Files259092 -Node: Seealso260426 -Node: Bugreport261141 -Node: Legal261732 -Node: CommandIdx262744 -Node: ConceptIdx279859 +Node: Jigdo162314 +Node: Charset166573 +Node: Exception169902 +Node: DialogCtl176031 +Node: Inquiry178633 +Node: Navigate187083 +Node: Verify195378 +Node: Restore205256 +Node: Emulation213869 +Node: Scripting224279 +Node: Frontend232062 +Node: Examples241697 +Node: ExDevices242875 +Node: ExCreate243536 +Node: ExDialog244836 +Node: ExGrowing246107 +Node: ExModifying246916 +Node: ExBootable247426 +Node: ExCharset247981 +Node: ExPseudo248877 +Node: ExCdrecord249804 +Node: ExMkisofs250124 +Node: ExGrowisofs251481 +Node: ExException252635 +Node: ExTime253093 +Node: ExIncBackup253551 +Node: ExRestore257577 +Node: ExRecovery258523 +Node: Files259095 +Node: Seealso260429 +Node: Bugreport261144 +Node: Legal261735 +Node: CommandIdx262747 +Node: ConceptIdx279862  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 5791bf44..e0e6cbf7 100644 --- a/xorriso/xorriso.texi +++ b/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.4.5, Jul 02, 2016" +@c man .TH XORRISO 1 "Version 1.4.5, Jul 03, 2016" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -3914,7 +3914,7 @@ of type 0xee which covers the whole output data. @* @strong{appended_part_as=mbr} is the default. Appended partitions get marked in GPT only if GPT is produced because of other settings. -If given explicitely, this clears setting "gpt" and "apm". Nevertheless "apm" +If given explicitly, this clears setting "gpt" and "apm". Nevertheless "apm" may be added to "mbr". @* @cindex Appended partition, in APM @@ -4284,10 +4284,10 @@ The default output charset is the local character set of the terminal where @command{xorriso} runs. So by default no conversion happens between local filesystem names and emerging Rock Ridge names in the image. The situation stays -ambigous and the reader has to riddle what character set was used. +ambiguous and the reader has to riddle what character set was used. @* By command -auto_charset it is possible to attribute the output charset name -to the image. This makes the situation unambigous. But if your terminal +to the image. This makes the situation unambiguous. But if your terminal character set does not match the character set of the local file names, then this attribute can become plainly wrong and cause problems at read time. To prevent this it is necessary to check whether the terminal properly @@ -5036,7 +5036,7 @@ correction will fail and the drive is supposed to indicate error. @* @command{xorriso} can scan a medium for readable data blocks, classify them according -to their read speed, save them to a file, and keep track of successfuly saved +to their read speed, save them to a file, and keep track of successfully saved blocks for further tries on the same medium. @* By command -md5 checksums may get recorded with data files and whole @@ -5814,7 +5814,7 @@ prevent the wrapping of file addresses into quotation marks with commands -pwd -pwdx -ls -lsd -lsl -lsdl -lsx -lsdx -lslx -lsdlx -du -dus -dux -dusx -findx -find @* -This will make ambigous the representation of file names which contain +This will make ambiguous the representation of file names which contain newline characters. On the other hand it should facilitate integration of xorriso into shell scripts which already use the corresponding shell commands. diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 9dcd2dc3..c0a32ea5 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2016.07.02.144635" +#define Xorriso_timestamP "2016.07.03.204237" diff --git a/xorriso/xorrisofs.1 b/xorriso/xorrisofs.1 index e3e13cf8..e6757e74 100644 --- a/xorriso/xorrisofs.1 +++ b/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 "Version 1.4.5, Jul 02, 2016" +.TH XORRISOFS 1 "Version 1.4.5, Jul 03, 2016" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -747,9 +747,9 @@ Issue HFS+ blessing "ppc_bootdir" to the directory which stems from the directory disk_path in the local filesystem tree. .br This works only if there is at least one data file underneath the directory. -disk_path can become ambigous if files from different local filesystem +disk_path can become ambiguous if files from different local filesystem sub\-trees are put into the same sub\-tree of the ISO image. -Consider to use \-hfs\-bless\-by "p" for unambigous addressing via iso_rr_path. +Consider to use \-hfs\-bless\-by "p" for unambiguous addressing via iso_rr_path. .TP .B Settings for file hiding: .TP diff --git a/xorriso/xorrisofs.info b/xorriso/xorrisofs.info index bfe8c9ea..7c238be6 100644 --- a/xorriso/xorrisofs.info +++ b/xorriso/xorrisofs.info @@ -676,9 +676,9 @@ File: xorrisofs.info, Node: SetExtras, Next: SetHide, Prev: SetCompl, Up: Op Issue HFS+ blessing "ppc_bootdir" to the directory which stems from the directory disk_path in the local filesystem tree. This works only if there is at least one data file underneath the - directory. disk_path can become ambigous if files from different + directory. disk_path can become ambiguous if files from different local filesystem sub-trees are put into the same sub-tree of the - ISO image. Consider to use -hfs-bless-by "p" for unambigous + ISO image. Consider to use -hfs-bless-by "p" for unambiguous addressing via iso_rr_path.  @@ -2269,26 +2269,26 @@ Node: SetInsert9753 Node: SetProduct14162 Node: SetCompl19338 Node: SetExtras21930 -Node: SetHide31651 -Node: ImageId32955 -Node: Bootable37126 -Node: SystemArea42294 -Node: Charset57999 -Node: Jigdo59024 -Node: Miscellaneous63301 -Node: Examples64946 -Node: ExSimple65440 -Node: ExGraft65923 -Node: ExMkisofs67223 -Node: ExGrowisofs68489 -Node: ExIncBackup69679 -Node: ExIncBckAcc72840 -Node: ExBootable74529 -Node: Files78711 -Node: Seealso79806 -Node: Bugreport80455 -Node: Legal81046 -Node: CommandIdx81943 -Node: ConceptIdx97235 +Node: SetHide31653 +Node: ImageId32957 +Node: Bootable37128 +Node: SystemArea42296 +Node: Charset58001 +Node: Jigdo59026 +Node: Miscellaneous63303 +Node: Examples64948 +Node: ExSimple65442 +Node: ExGraft65925 +Node: ExMkisofs67225 +Node: ExGrowisofs68491 +Node: ExIncBackup69681 +Node: ExIncBckAcc72842 +Node: ExBootable74531 +Node: Files78713 +Node: Seealso79808 +Node: Bugreport80457 +Node: Legal81048 +Node: CommandIdx81945 +Node: ConceptIdx97237  End Tag Table diff --git a/xorriso/xorrisofs.texi b/xorriso/xorrisofs.texi index 5526a07b..ce8d14d6 100644 --- a/xorriso/xorrisofs.texi +++ b/xorriso/xorrisofs.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 XORRISOFS 1 "Version 1.4.5, Jul 02, 2016" +@c man .TH XORRISOFS 1 "Version 1.4.5, Jul 03, 2016" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1030,9 +1030,9 @@ Issue HFS+ blessing "ppc_bootdir" to the directory which stems from the directory disk_path in the local filesystem tree. @* This works only if there is at least one data file underneath the directory. -disk_path can become ambigous if files from different local filesystem +disk_path can become ambiguous if files from different local filesystem sub-trees are put into the same sub-tree of the ISO image. -Consider to use -hfs-bless-by "p" for unambigous addressing via iso_rr_path. +Consider to use -hfs-bless-by "p" for unambiguous addressing via iso_rr_path. @end table @c man .TP @c man .B Settings for file hiding: