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

Correction about -as mkisofs -C if already an input device was set

Browse Source
This commit is contained in:
Thomas Schmitt 2008-07-07 15:02:02 +00:00
parent 2277038d67
commit dc890e3eb7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libisoburn/trunk/xorriso/xorriso.c
View File

@ -7615,6 +7615,12 @@ illegal_c:;
sfe[cpt-msc]= 0; sfe[cpt-msc]= 0;
if(strcmp(sfe, "16")==0) /* growisofs uses 16 to avoid a bug in mkisofs */ if(strcmp(sfe, "16")==0) /* growisofs uses 16 to avoid a bug in mkisofs */
strcpy(sfe, "0"); strcpy(sfe, "0");
if(indev[0]) {
/* give up indev before setting the load address */
ret= Xorriso_option_dev(xorriso, "", 1);
if(ret<=0)
return(ret);
}
ret= Xorriso_option_load(xorriso, "sbsector", sfe, 0); ret= Xorriso_option_load(xorriso, "sbsector", sfe, 0);
if(ret<=0) if(ret<=0)
return(ret); return(ret);
@ -9173,7 +9179,7 @@ int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag)
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
if((flag&1) && !(flag&4)) { if((flag&1) && (xorriso->in_drive_handle != NULL || adr[0]) && !(flag&4)) {
ret= Xorriso_reassure(xorriso, (flag&2) ? "-dev" : "-indev", ret= Xorriso_reassure(xorriso, (flag&2) ? "-dev" : "-indev",
"eventually discard the current image", 0); "eventually discard the current image", 0);
if(ret<=0) if(ret<=0)

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.07.07.102941" #define Xorriso_timestamP "2008.07.07.150241"