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

Silenced a FAILURE message with -acl if no image is loaded

Browse Source
This commit is contained in:
Thomas Schmitt 2009-01-23 17:28:02 +00:00
parent d94e185232
commit 0b093f0ccc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
#define Xorriso_timestamP "2009.01.23.172652" #define Xorriso_timestamP "2009.01.23.172757"

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

@ -1706,11 +1706,14 @@ int Xorriso__read_pacifier(IsoImage *image, IsoFileSource *filesource)
return(1); return(1);
} }
/* @param flag bit0=silently return 0 if no volume/image is present
*/
int Xorriso_get_volume(struct XorrisO *xorriso, IsoImage **volume, int Xorriso_get_volume(struct XorrisO *xorriso, IsoImage **volume,
int flag) int flag)
{ {
if(xorriso->in_volset_handle==NULL) { if(xorriso->in_volset_handle==NULL) {
if(flag & 1)
return(0);
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text,"No ISO image present."); sprintf(xorriso->info_text,"No ISO image present.");
if(xorriso->indev[0]==0 && xorriso->outdev[0]==0) if(xorriso->indev[0]==0 && xorriso->outdev[0]==0)
@ -8871,7 +8874,7 @@ int Xorriso_set_ignore_aclea(struct XorrisO *xorriso, int flag)
int ret; int ret;
IsoImage *volume; IsoImage *volume;
ret= Xorriso_get_volume(xorriso, &volume, 0); ret= Xorriso_get_volume(xorriso, &volume, 1);
if(ret<=0) if(ret<=0)
return(ret); return(ret);
iso_image_set_ignore_aclea(volume, iso_image_set_ignore_aclea(volume,