From ea0d815b0ff691069d83ea5dca56ba265b3e5fc4 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 11 Feb 2008 21:40:01 +0000 Subject: [PATCH] Mapping in burn runs -abort_on MISHAP to SORRY --- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 10a8e214..af814898 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.02.11.194807" +#define Xorriso_timestamP "2008.02.11.213918" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index fe83915d..1a3457f8 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -830,6 +830,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag) sopts.fifo_size= xorriso->fs * 2048; #endif /* NIX */ + Xorriso_set_abort_severity(xorriso, 1); if(xorriso->out_drive_handle == xorriso->in_drive_handle || xorriso->in_drive_handle == NULL) { ret= isoburn_prepare_disc(source_drive, &disc, sopts); @@ -940,6 +941,7 @@ no_track:; ret= 1; ex:; xorriso->run_state= 0; /* Indicate that burning has ended */ + Xorriso_set_abort_severity(xorriso, 0); if(ret<=0) { /* >>> ??? revive discarded boot image */; @@ -3617,11 +3619,15 @@ int Xorriso_get_volid(struct XorrisO *xorriso, char volid[33], int flag) } +/* @param flag bit0=prepare for a burn run */ int Xorriso_set_abort_severity(struct XorrisO *xorriso, int flag) { int ret; - ret= iso_set_abort_severity(xorriso->abort_on_text); + if((flag&1) && strcmp(xorriso->abort_on_text, "MISHAP")==0) + ret= iso_set_abort_severity("SORRY"); + else + ret= iso_set_abort_severity(xorriso->abort_on_text); return(ret>=0); }