libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapted -report_system_area perception of appended partitions to changes in libisofs

Browse Source
This commit is contained in:
Thomas Schmitt 2018-09-09 14:59:47 +02:00
parent 92665c8be3
commit 7add4133d2
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xorriso/iso_img.c
View File

@ -1648,7 +1648,12 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
int appended_as_gpt= 0, have_prep= 0, did_sysarea= 0, cared_for_apm= 0; int appended_as_gpt= 0, have_prep= 0, did_sysarea= 0, cared_for_apm= 0;
int cared_for_sparc= 0, have_hfsplus= 0; int cared_for_sparc= 0, have_hfsplus= 0;
int have_sysarea= 0, ptable_killer, imported_iso, have_alpha_ldr_path= 0; int have_sysarea= 0, ptable_killer, imported_iso, have_alpha_ldr_path= 0;
int have_protective_msdos= 0, appended_partition= 0, part_like_isohybrid= 0; int have_protective_msdos= 0, part_like_isohybrid= 0;
#ifdef Not_any_more_because_padding_is_now_after_partitions
int appended_partition= 0;
#endif
int iso_mbr_part_type= -1; int iso_mbr_part_type= -1;
unsigned int prev_pltf= 0; unsigned int prev_pltf= 0;
unsigned long int sa_options= 0, partno, id_tag, perms, start_cyl, num_blocks; unsigned long int sa_options= 0, partno, id_tag, perms, start_cyl, num_blocks;
@ -2079,7 +2084,11 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
imported_iso); imported_iso);
if(partno >= 1 && (int) partno <= mbr_count) if(partno >= 1 && (int) partno <= mbr_count)
mbrpts[partno - 1].appended= 1; mbrpts[partno - 1].appended= 1;
#ifdef Not_any_more_because_padding_is_now_after_partitions
appended_partition= 1; appended_partition= 1;
#endif
} }
} else if(part_type == 0x41 && have_prep) { } else if(part_type == 0x41 && have_prep) {
if(mkisofs) { if(mkisofs) {
@ -2192,7 +2201,11 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
imported_iso); imported_iso);
Xorriso_record_cmd_linE Xorriso_record_cmd_linE
buf[0]= 0; buf[0]= 0;
#ifdef Not_any_more_because_padding_is_now_after_partitions
appended_partition= 1; appended_partition= 1;
#endif
} }
/* Check for isohybri-ish MBR and GPT mix */ /* Check for isohybri-ish MBR and GPT mix */
@ -2520,7 +2533,11 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
mbrpts[i].block_count - 1, mbrpts[i].block_count - 1,
"d", imported_iso); "d", imported_iso);
Xorriso_record_cmd_linE Xorriso_record_cmd_linE
#ifdef Not_any_more_because_padding_is_now_after_partitions
appended_partition= 1; appended_partition= 1;
#endif
buf[0]= 0; buf[0]= 0;
} }
} }
@ -2668,6 +2685,8 @@ after_el_torito:
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
} }
#ifdef Not_any_more_because_padding_is_now_after_partitions
if(appended_partition) { if(appended_partition) {
if(mkisofs) if(mkisofs)
sprintf(buf, "-no-pad"); sprintf(buf, "-no-pad");
@ -2676,6 +2695,8 @@ after_el_torito:
Xorriso_record_cmd_linE Xorriso_record_cmd_linE
} }
#endif /* Not_any_more_because_padding_is_now_after_partitions */
ret= 1; ret= 1;
ex: ex:
xorriso->show_hfs_cmds= NULL; xorriso->show_hfs_cmds= NULL;

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2018.09.01.191851" #define Xorriso_timestamP "2018.09.09.125911"