diff --git a/libisoburn/trunk/xorriso/xorriso.c b/libisoburn/trunk/xorriso/xorriso.c index a574b03f..7c38b48d 100644 --- a/libisoburn/trunk/xorriso/xorriso.c +++ b/libisoburn/trunk/xorriso/xorriso.c @@ -11649,22 +11649,6 @@ not_enough_args:; strcmp(argv[i], "-eltorito-boot") == 0 || strcmp(argv[i], "--efi-boot") == 0) { i++; - if(xorriso->boot_platform_id == 0xef) { - /* >>> provisory: ts B00419 - get size of xorriso->boot_image_bin_path, round up to 512 - */; - ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, - xorriso->boot_image_bin_path, sfe, 2 | 8); - if(ret<=0) - goto problem_handler_2; - ret= Xorriso_iso_lstat(xorriso, sfe, &stbuf, 2 | 4); - if(ret < 0) - goto problem_handler_2; - xorriso->boot_image_load_size= ((stbuf.st_size / (off_t) 512) + - !!(stbuf.st_size % (off_t) 512)) - * 512; - } - } else if(strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "-eltorito-catalog") == 0) { i++; @@ -11766,6 +11750,21 @@ problem_handler_2:; continue; goto ex; } + if(xorriso->boot_image_bin_path[0] && xorriso->boot_platform_id == 0xef) { + /* >>> provisory: ts B00419 + get size of xorriso->boot_image_bin_path, round up to 512 + */; + ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, + xorriso->boot_image_bin_path, sfe, 2 | 8); + if(ret<=0) + goto problem_handler_2; + ret= Xorriso_iso_lstat(xorriso, sfe, &stbuf, 2 | 4); + if(ret < 0) + goto problem_handler_2; + xorriso->boot_image_load_size= ((stbuf.st_size / (off_t) 512) + + !!(stbuf.st_size % (off_t) 512)) * 512; + } + if(do_print_size) { ret= Xorriso_option_print_size(xorriso, 1); if(ret<=0) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index e04e91ee..f58dc689 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.04.20.091732" +#define Xorriso_timestamP "2010.04.20.103448"