From 94cd208f3b0262b03aedb75c81e684bfd30cf094 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 29 Dec 2010 10:40:53 +0000 Subject: [PATCH] Bug fix: -as mkisofs -print-size did not account for -partition_offset --- libisoburn/trunk/xorriso/emulators.c | 9 +++++---- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index 43034e53..525b315c 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -1526,10 +1526,6 @@ problem_handler_2:; continue; goto ex; } - if(do_print_size) { - ret= Xorriso_option_print_size(xorriso, 1); - goto ex; - } if(lower_r) { static char *lower_r_args[3]= {"/", "-exec", "mkisofs_r"}; zero= 0; @@ -1724,6 +1720,11 @@ problem_handler_boot:; was_failure= 1; } + if(do_print_size) { + ret= Xorriso_option_print_size(xorriso, 1); + goto ex; + } + ret= !was_failure; ex:; if(was_path && !do_print_size) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 6e129bc3..3f5cde0e 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.12.28.123348" +#define Xorriso_timestamP "2010.12.29.104047"