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

Improved interaction of -as mkisofs command with other commands

Browse Source
This commit is contained in:
Thomas Schmitt
2013-03-10 19:34:09 +00:00
parent 0d3908da8f
commit c2088a4d48
9 changed files with 116 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xorriso/write_run.c
View File

@ -2,7 +2,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later.
@ -588,6 +588,7 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
xorriso->boot_image_bin_path[0]= 0;
xorriso->boot_image_bin_form[0]= 0;
xorriso->boot_image_emul= 0;
xorriso->boot_emul_default= 1;
xorriso->boot_image_load_size= 4 * 512;
memset(xorriso->boot_id_string, 0, sizeof(xorriso->boot_id_string));
memset(xorriso->boot_selection_crit, 0,
@ -2077,8 +2078,10 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
} else if((l == 16 && strncmp(cpt, "allow_dir_id_ext", l) == 0) ||
(l == 19 && strncmp(cpt, "allow_dir_id_ext_on", l) == 0) ) {
xorriso->relax_compliance|= isoburn_igopt_allow_dir_id_ext;
xorriso->allow_dir_id_ext_dflt= 0;
} else if((l == 20 && strncmp(cpt, "allow_dir_id_ext_off", l) == 0)) {
xorriso->relax_compliance&= ~isoburn_igopt_allow_dir_id_ext;
xorriso->allow_dir_id_ext_dflt= 0;
} else if((l == 12 && strncmp(cpt, "omit_version", l) == 0) ||
(l == 15 && strncmp(cpt, "omit_version_on", l) == 0) ) {
@ -2207,10 +2210,12 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
if(value == 1 || value == 2) {
limit= ((off_t) 4) * ((off_t) 1024*1024*1024) - ((off_t) 1);
xorriso->iso_level= value;
xorriso->iso_level_is_default= 0;
if(xorriso->file_size_limit > limit)
xorriso->file_size_limit= limit;
} else if(value == 3) {
xorriso->iso_level= value;
xorriso->iso_level_is_default= 0;
if(xorriso->file_size_limit < Xorriso_default_file_size_limiT)
xorriso->file_size_limit= Xorriso_default_file_size_limiT;
} else {