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

Avoided misleading message about emptied ISO image during -as mkisofs -C

Browse Source
This commit is contained in:
Thomas Schmitt 2008-07-08 13:20:17 +00:00
parent fb7450a826
commit 73b9831f09
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7615,7 +7615,7 @@ illegal_c:;
sfe[cpt-msc]= 0;
if(strcmp(sfe, "16")==0) /* growisofs uses 16 to avoid a bug in mkisofs */
strcpy(sfe, "0");
if(indev[0]) {
if(xorriso->in_drive_handle!=NULL) {
/* give up indev before setting the load address */
ret= Xorriso_option_dev(xorriso, "", 1);
if(ret<=0)
@ -9196,7 +9196,7 @@ int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag)
Text_shellsafe(xorriso->indev, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
}
if((flag&2) && xorriso->in_drive_handle != NULL &&
if((flag&2) && xorriso->out_drive_handle != NULL &&
xorriso->in_drive_handle != xorriso->out_drive_handle) {
sprintf(xorriso->info_text,"Giving up -outdev %s",
Text_shellsafe(xorriso->outdev, sfe, 0));

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

@ -1 +1 @@
#define Xorriso_timestamP "2008.07.08.102622"
#define Xorriso_timestamP "2008.07.08.132054"

2
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -961,7 +961,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
if(ret>0) {
/* Allow the consumer of output to access the input drive */
source_drive= NULL;
ret= Xorriso_give_up_drive(xorriso, 1);
ret= Xorriso_give_up_drive(xorriso, 1|8);
if(ret<=0)
goto ex;
}