From bf174f657607950baec7d50be6dca4fda9c715d8 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 18 Jan 2012 09:35:43 +0000 Subject: [PATCH] Improved interpretation of -check_media min_lba= --- libisoburn/trunk/xorriso/drive_mgt.c | 13 +++++++++---- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libisoburn/trunk/xorriso/drive_mgt.c b/libisoburn/trunk/xorriso/drive_mgt.c index a84854ad..f49fa3bf 100644 --- a/libisoburn/trunk/xorriso/drive_mgt.c +++ b/libisoburn/trunk/xorriso/drive_mgt.c @@ -886,7 +886,7 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag) struct burn_multi_caps *caps= NULL; struct burn_drive *drive; enum burn_disc_status s; - char mem_text[80]; + char mem_text[80], *num_free_text; off_t start_byte= 0, num_free= 0, size; unsigned dummy; struct isoburn_toc_disc *disc= NULL; @@ -1042,8 +1042,12 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag) lba= num_blocks; } - sprintf(respt, "Media blocks : %d readable , %d writable , %d overall\n", - num_data, (int) num_free, lba); + if(drive_role == 4) + num_free_text = "unused"; + else + num_free_text = "writable"; + sprintf(respt, "Media blocks : %d readable , %d %s , %d overall\n", + num_data, (int) num_free, num_free_text, lba); Xorriso_toc_line(xorriso, flag & 8); } @@ -2635,8 +2639,9 @@ libburn_whole_disc:; Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); {ret= 0; goto ex;} } + blocks-= start_lba; xorriso->pacifier_total= blocks; - ret= Xorriso_check_interval(xorriso, *spotlist, job, 0, blocks, + ret= Xorriso_check_interval(xorriso, *spotlist, job, start_lba, blocks, read_chunk, 0, 0); if(ret <= 0) goto ex; diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 218f38e8..86ada882 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.01.15.104012" +#define Xorriso_timestamP "2012.01.18.093532"