From 5d85defafa4287b8de43117231ae972dbbe58a74 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 25 Jul 2011 09:59:12 +0000 Subject: [PATCH] New -check_media option what=image --- libisoburn/trunk/xorriso/check_media.c | 6 +- libisoburn/trunk/xorriso/check_media.h | 4 +- libisoburn/trunk/xorriso/xorriso.1 | 22 ++-- libisoburn/trunk/xorriso/xorriso.info | 106 ++++++++++--------- libisoburn/trunk/xorriso/xorriso.texi | 6 +- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 6 files changed, 83 insertions(+), 63 deletions(-) diff --git a/libisoburn/trunk/xorriso/check_media.c b/libisoburn/trunk/xorriso/check_media.c index 2ede8894..05fb0b3e 100644 --- a/libisoburn/trunk/xorriso/check_media.c +++ b/libisoburn/trunk/xorriso/check_media.c @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2010 Thomas Schmitt, + Copyright 2007-2011 Thomas Schmitt, Provided under GPL version 2 or later. @@ -805,8 +805,10 @@ int Xorriso_check_media_setup_job(struct XorrisO *xorriso, } else if(strncmp(argv[i], "what=", 5) == 0) { if(strcmp(argv[i]+5, "tracks") == 0) job->mode= 0; - else if(strcmp(argv[i]+5, "disc")== 0) + else if(strcmp(argv[i]+5, "image")== 0) job->mode= 1; + else if(strcmp(argv[i]+5, "disc")== 0) + job->mode= 2; else { unknown_value:; sprintf(xorriso->info_text, diff --git a/libisoburn/trunk/xorriso/check_media.h b/libisoburn/trunk/xorriso/check_media.h index 7f8bedf7..452cfa96 100644 --- a/libisoburn/trunk/xorriso/check_media.h +++ b/libisoburn/trunk/xorriso/check_media.h @@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2010 Thomas Schmitt, + Copyright 2007-2011 Thomas Schmitt, Provided under GPL version 2 or later. @@ -102,7 +102,7 @@ struct CheckmediajoB { */ int mode; /* 0= track by track 1= single sweep over libisoburn media capacity - >>> 2= single sweep over libburn media capacity + 2= single sweep over libburn media capacity */ time_t start_time; int time_limit; /* Number of seconds after which to abort */ diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 06de5db4..57e77f95 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.1.3, Jul 08, 2011" +.TH XORRISO 1 "Version 1.1.3, Jul 24, 2011" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -2057,16 +2057,20 @@ MMC format codes are manifold. Most important are: Smaller format size with DVD\-RAM, BD\-RE, or BD\-R means more reserve space. .TP \fB\-list_speeds\fR -Put out a list of speed values as reported by the output drive for -the loaded media. At the end of the list, "Write speed L" and "Write speed H" -are the best guesses for lower and upper speed limit. -.br -"Write speed l" and "Write speed h" may appear only with CD -and eventually override the list of other speed offers. +Put out a list of speed values as reported by the output drive with +the loaded media. This does not necessarily mean that the media is writable +or that these speeds are actually achievable. Especially the +lists reported with empty drive or with ROM media obviously advertise +speeds for other media. .br It is not mandatory to use speed values out of the listed range. The drive is supposed to choose a safe speed that is as near to the desired speed as possible. +.br +At the end of the list, "Write speed L" and "Write speed H" +are the best guesses for lower and upper speed limit. +"Write speed l" and "Write speed h" may appear only with CD +and eventually override the list of other speed offers. .TP \fB\-close_damaged\fR "as_needed"|"force" Try to close the upcomming track and session if the drive reported the media @@ -3425,6 +3429,10 @@ sector_map= and processes this virtual outcome. \fBwhat="disc"\fR scans the payload range of a media without respecting track gaps. .br +\fBwhat="image"\fR +similar to "disc", but restricts scanning to the range of the ISO 9660 image, +if present. +.br \fBmin_lba=limit\fR omits all blocks with addresses lower than limit. .br diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 7f6b4d4f..a5fba607 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -1832,15 +1832,18 @@ File: xorriso.info, Node: Writing, Next: SetWrite, Prev: Filter, Up: Options reserve space. -list_speeds - Put out a list of speed values as reported by the output drive for - the loaded media. At the end of the list, "Write speed L" and - "Write speed H" are the best guesses for lower and upper speed - limit. - "Write speed l" and "Write speed h" may appear only with CD and - eventually override the list of other speed offers. + Put out a list of speed values as reported by the output drive with + the loaded media. This does not necessarily mean that the media is + writable or that these speeds are actually achievable. Especially + the lists reported with empty drive or with ROM media obviously + advertise speeds for other media. It is not mandatory to use speed values out of the listed range. The drive is supposed to choose a safe speed that is as near to the desired speed as possible. + At the end of the list, "Write speed L" and "Write speed H" are + the best guesses for lower and upper speed limit. "Write speed l" + and "Write speed h" may appear only with CD and eventually + override the list of other speed offers. -close_damaged "as_needed"|"force" Try to close the upcomming track and session if the drive reported @@ -3008,6 +3011,9 @@ transmission errors. what="disc" scans the payload range of a media without respecting track gaps. + what="image" + similar to "disc", but restricts scanning to the range of the + ISO 9660 image, if present. min_lba=limit omits all blocks with addresses lower than limit. max_lba=limit @@ -4201,8 +4207,8 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -cd sets working directory in ISO: Navigate. (line 7) * -cdx sets working directory on disk: Navigate. (line 16) * -charset sets input/output character set: Charset. (line 43) -* -check_md5 verifies file checksum: Verify. (line 144) -* -check_md5_r verifies file tree checksums: Verify. (line 160) +* -check_md5 verifies file checksum: Verify. (line 147) +* -check_md5_r verifies file tree checksums: Verify. (line 163) * -check_media reads media block by block: Verify. (line 21) * -check_media_defaults sets -check_media options: Verify. (line 40) * -chgrp sets group in ISO image: Manip. (line 50) @@ -4213,7 +4219,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -chown_r sets ownership in ISO image: Manip. (line 47) * -clone copies ISO directory tree: Insert. (line 171) * -close controls media closing: SetWrite. (line 262) -* -close_damaged closes damaged track and session: Writing. (line 133) +* -close_damaged closes damaged track and session: Writing. (line 136) * -close_filter_list bans filter registration: Filter. (line 52) * -commit writes pending ISO image: Writing. (line 13) * -commit_eject writes and ejects: Writing. (line 40) @@ -4277,7 +4283,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -joliet enables production of Joliet tree: SetWrite. (line 10) * -list_delimiter replaces '--': Scripting. (line 42) * -list_formats lists available formats: Writing. (line 110) -* -list_profiles lists supported media: Writing. (line 147) +* -list_profiles lists supported media: Writing. (line 150) * -list_speeds lists available write speeds: Writing. (line 122) * -load addresses a particular session as input: Loading. (line 11) * -local_charset sets terminal character set: Charset. (line 47) @@ -4419,7 +4425,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Create, new ISO image, _definiton: Methods. (line 6) * Cylinder alignment, _definiton: Bootable. (line 167) * Cylinder size, _definiton: Bootable. (line 156) -* Damaged track and session, close, -close_damaged: Writing. (line 133) +* Damaged track and session, close, -close_damaged: Writing. (line 136) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) * Delete, ISO directory, -rmdir: Manip. (line 32) @@ -4442,7 +4448,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, for input, -indev: AqDrive. (line 24) * Drive, for output, -outdev: AqDrive. (line 31) * Drive, get drive list, -devices: Inquiry. (line 7) -* Drive, list supported media, -list_profiles: Writing. (line 147) +* Drive, list supported media, -list_profiles: Writing. (line 150) * Drive, reduce activity, -calm_drive: Loading. (line 235) * Drive, report SCSI commands, -scsi_log: Scripting. (line 125) * Drive, write and eject, -commit_eject: Writing. (line 40) @@ -4611,8 +4617,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Verify, compare ISO and disk file, -compare: Navigate. (line 140) * Verify, compare ISO and disk tree, -compare_r: Navigate. (line 153) * Verify, compare ISO and disk, -compare_l: Navigate. (line 158) -* Verify, file checksum, -check_md5: Verify. (line 144) -* Verify, file tree checksums, -check_md5_r: Verify. (line 160) +* Verify, file checksum, -check_md5: Verify. (line 147) +* Verify, file tree checksums, -check_md5_r: Verify. (line 163) * Verify, preset -check_media, -check_media_defaults: Verify. (line 40) * Write, block size, -dvd_obs: SetWrite. (line 238) * Write, bootability, -boot_image: Bootable. (line 26) @@ -4659,41 +4665,41 @@ Node: Manip60454 Node: CmdFind69181 Node: Filter80443 Node: Writing84781 -Node: SetWrite92544 -Node: Bootable106590 -Node: Jigdo119808 -Node: Charset124054 -Node: Exception126813 -Node: DialogCtl132926 -Node: Inquiry135513 -Node: Navigate139841 -Node: Verify147809 -Node: Restore156347 -Node: Emulation163007 -Node: Scripting172810 -Node: Frontend178938 -Node: Examples180237 -Node: ExDevices181408 -Node: ExCreate182046 -Node: ExDialog183320 -Node: ExGrowing184582 -Node: ExModifying185384 -Node: ExBootable185885 -Node: ExCharset186434 -Node: ExPseudo187254 -Node: ExCdrecord188152 -Node: ExMkisofs188467 -Node: ExGrowisofs189805 -Node: ExException190940 -Node: ExTime191394 -Node: ExIncBackup191853 -Node: ExRestore195777 -Node: ExRecovery196735 -Node: Files197303 -Node: Seealso198601 -Node: Bugreport199189 -Node: Legal199770 -Node: CommandIdx200700 -Node: ConceptIdx215514 +Node: SetWrite92774 +Node: Bootable106820 +Node: Jigdo120038 +Node: Charset124284 +Node: Exception127043 +Node: DialogCtl133156 +Node: Inquiry135743 +Node: Navigate140071 +Node: Verify148039 +Node: Restore156704 +Node: Emulation163364 +Node: Scripting173167 +Node: Frontend179295 +Node: Examples180594 +Node: ExDevices181765 +Node: ExCreate182403 +Node: ExDialog183677 +Node: ExGrowing184939 +Node: ExModifying185741 +Node: ExBootable186242 +Node: ExCharset186791 +Node: ExPseudo187611 +Node: ExCdrecord188509 +Node: ExMkisofs188824 +Node: ExGrowisofs190162 +Node: ExException191297 +Node: ExTime191751 +Node: ExIncBackup192210 +Node: ExRestore196134 +Node: ExRecovery197092 +Node: Files197660 +Node: Seealso198958 +Node: Bugreport199546 +Node: Legal200127 +Node: CommandIdx201057 +Node: ConceptIdx215871  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index e3ff3114..b9424515 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.1.3, Jul 12, 2011" +@c man .TH XORRISO 1 "Version 1.1.3, Jul 24, 2011" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -4059,6 +4059,10 @@ sector_map= and processes this virtual outcome. @item what="disc" scans the payload range of a media without respecting track gaps. @* +@item what="image" +similar to "disc", but restricts scanning to the range of the ISO 9660 image, +if present. +@* @item min_lba=limit omits all blocks with addresses lower than limit. @* diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 9b5b7b23..3f673b46 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.07.24.203919" +#define Xorriso_timestamP "2011.07.25.095843"