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

Silenced misleading toc messages with -commit_eject "in"

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-08 21:52:05 +00:00
parent 94ce48c7c2
commit 7e15b51a5f
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6416,12 +6416,12 @@ int Xorriso_option_commit_eject(struct XorrisO *xorriso, char *which, int flag)
int ret, eret; int ret, eret;
ret= Xorriso_option_commit(xorriso, 1); ret= Xorriso_option_commit(xorriso, 1);
if(ret<=0 || ret==2) if(ret<=0 || ret==2 || ret==3)
return(ret); return(ret);
if(strcmp(which, "none")==0 || strcmp(which, "")==0) if(strcmp(which, "none")==0 || strcmp(which, "")==0)
eret= 1; eret= 1;
else else
eret= Xorriso_option_eject(xorriso, which, 0); eret= Xorriso_option_eject(xorriso, which, 1);
ret= Xorriso_option_dev(xorriso, "", 3|4); ret= Xorriso_option_dev(xorriso, "", 3|4);
if(eret<ret) if(eret<ret)
return(eret); return(eret);
@ -6653,6 +6653,8 @@ int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag)
/* Option -eject */ /* Option -eject */
/* @param flag bit0=do not report toc of eventually remaining drives
*/
int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag) int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag)
{ {
int gu_flag= 4, ret; int gu_flag= 4, ret;
@ -6669,6 +6671,8 @@ int Xorriso_option_eject(struct XorrisO *xorriso, char *which, 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)
gu_flag|= 8;
ret= Xorriso_give_up_drive(xorriso, gu_flag); ret= Xorriso_give_up_drive(xorriso, gu_flag);
return(ret); return(ret);
} }

6
libisoburn/trunk/xorriso/xorriso.h
View File

@ -149,7 +149,9 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag); int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag);
/* Option -add */ /* Option -add */
/* @param flag bit0=do not report the added item */ /* @param flag bit0=do not report the added item
bit1=do not reset pacifier
*/
int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv, int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag); int *idx, int flag);
@ -243,6 +245,8 @@ int Xorriso_option_disk_pattern(struct XorrisO *xorriso, char *mode, int flag);
int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag); int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag);
/* Option -eject */ /* Option -eject */
/* @param flag bit0=do not report toc of eventually remaining drives
*/
int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag); int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag);
/* Options -end , and -rollback_end */ /* Options -end , and -rollback_end */

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

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.08.195627" #define Xorriso_timestamP "2008.02.08.215113"