From b03107dae8b566029b5a12159daea9daa9d1abde Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 28 Jan 2008 10:54:55 +0000 Subject: [PATCH] Made use of iso_set_abort_severity() with option -abort_on --- xorriso/xorriso.c | 3 ++- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisoburn.c | 11 ++++++++++- xorriso/xorrisoburn.h | 3 +++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c index 30645dcc..3215725d 100644 --- a/xorriso/xorriso.c +++ b/xorriso/xorriso.c @@ -5969,6 +5969,7 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag) if(Sfile_str(xorriso->abort_on_text,severity,0)<=0) return(-1); xorriso->abort_on_severity= sev; + Xorriso_set_abort_severity(xorriso, 0); return(1); } @@ -6013,7 +6014,7 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv, *wpt= 0; } -/* <<< do not apply wdx to both +/* <<< do not apply wdx to both, but wdi to ISO and wdx to disk if(source[0]!='/') { ret= Sfile_prepend_path(xorriso->wdx, source, 0); if(ret<=0) diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 216a2653..93298d93 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.01.27.174454" +#define Xorriso_timestamP "2008.01.28.105404" diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c index c067c57e..206be0c5 100644 --- a/xorriso/xorrisoburn.c +++ b/xorriso/xorrisoburn.c @@ -3249,4 +3249,13 @@ int Xorriso_get_volid(struct XorrisO *xorriso, char volid[33], int flag) volid[32]= 0; return(1); } - + + +int Xorriso_set_abort_severity(struct XorrisO *xorriso, int flag) +{ + int ret; + + ret= iso_set_abort_severity(xorriso->abort_on_text); + return(ret>=0); +} + diff --git a/xorriso/xorrisoburn.h b/xorriso/xorrisoburn.h index b5b66677..ffe2ec05 100644 --- a/xorriso/xorrisoburn.h +++ b/xorriso/xorrisoburn.h @@ -135,5 +135,8 @@ int Xorriso_set_volid(struct XorrisO *xorriso, char *volid, int flag); int Xorriso_get_volid(struct XorrisO *xorriso, char volid[33], int flag); +int Xorriso_set_abort_severity(struct XorrisO *xorriso, int flag); + + #endif /* Xorrisoburn_includeD */