From 7191a67a8c74b90b36525ecac52b66e26fb7e713 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 30 Dec 2012 10:10:05 +0000 Subject: [PATCH] Corrected a typo in man page of xorrecord, tolerating--grow_over[w]rit[e]able_iso --- libisoburn/trunk/xorriso/emulators.c | 5 +- libisoburn/trunk/xorriso/xorrecord.1 | 12 ++-- libisoburn/trunk/xorriso/xorrecord.info | 58 ++++++++++---------- libisoburn/trunk/xorriso/xorrecord.texi | 12 ++-- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 5 files changed, 46 insertions(+), 43 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index 19271828..06783f44 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -278,7 +278,10 @@ no_volunteer:; ret= Xorriso_option_fs(xorriso, cpt, 0); if(ret<=0) goto ex; - } else if(strcmp(argv[i], "--grow_overwriteable_iso")==0) { + } else if(strcmp(argv[i], "--grow_overwriteable_iso")==0 || + strcmp(argv[i], "--grow_overwritable_iso")==0 || + strcmp(argv[i], "--grow_overriteable_iso")==0 + ) { /* (A history of typos) */ /* intentional: argv[i] */ do_grow= 1; } else if(strcmp(argpt, "-help")==0) { diff --git a/libisoburn/trunk/xorriso/xorrecord.1 b/libisoburn/trunk/xorriso/xorrecord.1 index c2e8f089..d8955c19 100644 --- a/libisoburn/trunk/xorriso/xorrecord.1 +++ b/libisoburn/trunk/xorriso/xorrecord.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 XORRECORD 1 "Version 1.2.5, Jul 20, 2012" +.TH XORRECORD 1 "Version 1.2.5, Dec 30, 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -85,7 +85,7 @@ formatted once to become overwritable. See options .br If ISO 9660 filesystems are to be stored on overwritable media, then it is possible to emulate multiple sessions, by using option -\fB\-\-grow_overriteable_iso\fR. In this case, the need for +\fB\-\-grow_overwriteable_iso\fR. In this case, the need for blanking before re\-use is emulated too. .SS .B Drive preparation and addressing: @@ -201,7 +201,7 @@ If there are sessions, then their start block address and size is reported. If a session contains an ISO 9660 filesystem, then its Volume Id is reported. If the medium is writable, then the next writable block address is reported. .br -If not option \fB\-\-grow_overriteable_iso\fR is given or no ISO 9660 +If not option \fB\-\-grow_overwriteable_iso\fR is given or no ISO 9660 file system is present on the medium, then overwritable media are reported as being blank. This is due to the fact that they can be written from scratch without further preparation, and that MMC does not distinguish @@ -627,7 +627,7 @@ directory ./tree1 under the ISO 9660 directory /dir1: .br $ xorrecord \-v dev=/dev/sr0 speed=12 fs=8m \\ .br - \-multi \-\-grow_overwritable_iso \\ + \-multi \-\-grow_overwriteable_iso \\ .br blank=as_needed \-eject padsize=300k image_1.iso .br @@ -656,7 +656,7 @@ Now burn the new session onto the same medium. This time without blanking: .br $ xorrecord \-v dev=/dev/sr0 speed=12 fs=8m \\ .br - \-multi \-\-grow_overwritable_iso \\ + \-multi \-\-grow_overwriteable_iso \\ .br \-eject padsize=300k image_2.iso .br @@ -673,7 +673,7 @@ in a pipeline without storing the ISO 9660 image as file on hard disk: .br | xorrecord \-v dev=/dev/sr0 speed=12 fs=8m \\ .br - \-waiti \-multi \-\-grow_overwritable_iso \\ + \-waiti \-multi \-\-grow_overwriteable_iso \\ .br \-eject padsize=300k \- .br diff --git a/libisoburn/trunk/xorriso/xorrecord.info b/libisoburn/trunk/xorriso/xorrecord.info index 3bc0fd06..3831ab40 100644 --- a/libisoburn/trunk/xorriso/xorrecord.info +++ b/libisoburn/trunk/xorriso/xorrecord.info @@ -89,7 +89,7 @@ formatted once to become overwritable. See options *blank=format_overwrite* and *blank=deformat*. If ISO 9660 filesystems are to be stored on overwritable media, then it is possible to emulate multiple sessions, by using option -*-grow_overriteable_iso*. In this case, the need for blanking before +*-grow_overwriteable_iso*. In this case, the need for blanking before re-use is emulated too.  @@ -222,7 +222,7 @@ File: xorrecord.info, Node: Inquire, Next: SetBurn, Prev: DriveAddr, Up: Opt a session contains an ISO 9660 filesystem, then its Volume Id is reported. If the medium is writable, then the next writable block address is reported. - If not option *-grow_overriteable_iso* is given or no ISO 9660 + If not option *-grow_overwriteable_iso* is given or no ISO 9660 file system is present on the medium, then overwritable media are reported as being blank. This is due to the fact that they can be written from scratch without further preparation, and that MMC @@ -656,7 +656,7 @@ option -multi is used. It will contain the files of hard disk directory $ xorrisofs -o image_1.iso -J -graft-points /dir1=./tree1 $ xorrecord -v dev=/dev/sr0 speed=12 fs=8m \ --multi -grow_overwritable_iso \ +-multi -grow_overwriteable_iso \ blank=as_needed -eject padsize=300k image_1.iso For the second session xorrisofs needs to know the -msinfo numbers of @@ -679,7 +679,7 @@ Now burn the new session onto the same medium. This time without blanking: $ xorrecord -v dev=/dev/sr0 speed=12 fs=8m \ --multi -grow_overwritable_iso \ +-multi -grow_overwriteable_iso \ -eject padsize=300k image_2.iso Operating systems which mount this medium will read the superblock of @@ -697,7 +697,7 @@ pipeline without storing the ISO 9660 image as file on hard disk: $ xorrisofs -M /dev/sr0 -C $m \ -J -graft-points /dir2=./tree2 \ | xorrecord -v dev=/dev/sr0 speed=12 fs=8m \ --waiti -multi -grow_overwritable_iso \ +-waiti -multi -grow_overwriteable_iso \ -eject padsize=300k - This is also the main use case of program *xorriso* itself, where this @@ -932,29 +932,29 @@ Tag Table: Node: Top401 Node: Overview1111 Node: Standards1632 -Node: Drive3783 -Node: Xorriso5107 -Node: Options5818 -Node: DriveAddr6186 -Node: Inquire7512 -Node: SetBurn10381 -Node: Verbous20591 -Node: NonCdrecord22141 -Node: Examples25307 -Node: ExDevices25968 -Node: ExMedium26186 -Node: ExBlank26449 -Node: ExFormat26670 -Node: ExDeformat27184 -Node: ExIsoSingle27451 -Node: ExIsoMulti27735 -Node: ExIsoFly29339 -Node: ExAfio30001 -Node: Files30982 -Node: Seealso31529 -Node: Bugreport31894 -Node: Legal32475 -Node: CommandIdx33402 -Node: ConceptIdx36388 +Node: Drive3784 +Node: Xorriso5108 +Node: Options5819 +Node: DriveAddr6187 +Node: Inquire7513 +Node: SetBurn10383 +Node: Verbous20593 +Node: NonCdrecord22143 +Node: Examples25309 +Node: ExDevices25970 +Node: ExMedium26188 +Node: ExBlank26451 +Node: ExFormat26672 +Node: ExDeformat27186 +Node: ExIsoSingle27453 +Node: ExIsoMulti27737 +Node: ExIsoFly29343 +Node: ExAfio30006 +Node: Files30987 +Node: Seealso31534 +Node: Bugreport31899 +Node: Legal32480 +Node: CommandIdx33407 +Node: ConceptIdx36393  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrecord.texi b/libisoburn/trunk/xorriso/xorrecord.texi index c7faae7f..6d0c7eec 100644 --- a/libisoburn/trunk/xorriso/xorrecord.texi +++ b/libisoburn/trunk/xorriso/xorrecord.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 XORRECORD 1 "Version 1.2.5, Jul 20, 2012" +@c man .TH XORRECORD 1 "Version 1.2.5, Dec 30, 2012" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -178,7 +178,7 @@ formatted once to become overwritable. See options @* If ISO 9660 filesystems are to be stored on overwritable media, then it is possible to emulate multiple sessions, by using option -@strong{--grow_overriteable_iso}. In this case, the need for +@strong{--grow_overwriteable_iso}. In this case, the need for blanking before re-use is emulated too. @c man .SS @sp 1 @@ -332,7 +332,7 @@ If there are sessions, then their start block address and size is reported. If a session contains an ISO 9660 filesystem, then its Volume Id is reported. If the medium is writable, then the next writable block address is reported. @* -If not option @strong{--grow_overriteable_iso} is given or no ISO 9660 +If not option @strong{--grow_overwriteable_iso} is given or no ISO 9660 file system is present on the medium, then overwritable media are reported as being blank. This is due to the fact that they can be written from scratch without further preparation, and that MMC does not distinguish @@ -876,7 +876,7 @@ directory ./tree1 under the ISO 9660 directory /dir1: @* $ xorrecord -v dev=/dev/sr0 speed=12 fs=8m \ @* - -multi --grow_overwritable_iso \ + -multi --grow_overwriteable_iso \ @* blank=as_needed -eject padsize=300k image_1.iso @* @@ -911,7 +911,7 @@ Now burn the new session onto the same medium. This time without blanking: @sp 1 $ xorrecord -v dev=/dev/sr0 speed=12 fs=8m \ @* - -multi --grow_overwritable_iso \ + -multi --grow_overwriteable_iso \ @* -eject padsize=300k image_2.iso @* @@ -932,7 +932,7 @@ in a pipeline without storing the ISO 9660 image as file on hard disk: @* | xorrecord -v dev=/dev/sr0 speed=12 fs=8m \ @* - -waiti -multi --grow_overwritable_iso \ + -waiti -multi --grow_overwriteable_iso \ @* -eject padsize=300k - @* diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index cdaa6fdf..285899de 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.12.25.180844" +#define Xorriso_timestamP "2012.12.30.100913"