New option -rollback_end
This commit is contained in:
parent
f311e91a86
commit
9e2e5817e6
@ -709,6 +709,9 @@ Mark end of particular action argument list.
|
|||||||
\fB\-rollback\fR
|
\fB\-rollback\fR
|
||||||
Discard the manipulated ISO image and reload it from -indev.
|
Discard the manipulated ISO image and reload it from -indev.
|
||||||
.TP
|
.TP
|
||||||
|
\fB\-rollback_end\fR
|
||||||
|
Discard the manipulated ISO image. End program without loading a new image.
|
||||||
|
.TP
|
||||||
.B Writing the result:
|
.B Writing the result:
|
||||||
(see also paragraph about settings below)
|
(see also paragraph about settings below)
|
||||||
.TP
|
.TP
|
||||||
|
@ -6741,15 +6741,20 @@ int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag)
|
|||||||
|
|
||||||
|
|
||||||
/* Option -end */
|
/* Option -end */
|
||||||
|
/* @param flag bit0= discard pending changes */
|
||||||
int Xorriso_option_end(struct XorrisO *xorriso, int flag)
|
int Xorriso_option_end(struct XorrisO *xorriso, int flag)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if(xorriso->volset_change_pending) {
|
if(xorriso->volset_change_pending) {
|
||||||
|
if(flag&1) {
|
||||||
|
xorriso->volset_change_pending= 0;
|
||||||
|
} else {
|
||||||
ret= Xorriso_option_commit(xorriso, 1);
|
ret= Xorriso_option_commit(xorriso, 1);
|
||||||
if(ret<=0)
|
if(ret<=0)
|
||||||
return(ret);
|
return(ret);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
ret= Xorriso_give_up_drive(xorriso, 3);
|
ret= Xorriso_give_up_drive(xorriso, 3);
|
||||||
if(ret<=0)
|
if(ret<=0)
|
||||||
return(ret);
|
return(ret);
|
||||||
@ -7293,7 +7298,9 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
|
|||||||
" # any text Is ignored. In dialog mode the input line will be stored in",
|
" # any text Is ignored. In dialog mode the input line will be stored in",
|
||||||
" the eventual readline history, nevertheless.",
|
" the eventual readline history, nevertheless.",
|
||||||
" -version Tell program and version number",
|
" -version Tell program and version number",
|
||||||
" -end End program immediately",
|
" -end End program. Commit eventual pending changes.",
|
||||||
|
" -rollback_end",
|
||||||
|
" End program. Discard pending changes.",
|
||||||
"",
|
"",
|
||||||
"",
|
"",
|
||||||
"Option -page causes a user prompt after the given number of result lines.",
|
"Option -page causes a user prompt after the given number of result lines.",
|
||||||
@ -8620,6 +8627,13 @@ next_command:;
|
|||||||
} else if(strcmp(cmd,"rollback")==0) {
|
} else if(strcmp(cmd,"rollback")==0) {
|
||||||
ret= Xorriso_option_rollback(xorriso, 0);
|
ret= Xorriso_option_rollback(xorriso, 0);
|
||||||
|
|
||||||
|
} else if(strcmp(cmd,"rollback_end")==0) {
|
||||||
|
Xorriso_option_end(xorriso, 1);
|
||||||
|
ret= Xorriso_eval_problem_status(xorriso, ret, 0);
|
||||||
|
if(ret<0)
|
||||||
|
return(ret);
|
||||||
|
{ret= 3; goto ex;}
|
||||||
|
|
||||||
} else if(strcmp(cmd,"speed")==0) {
|
} else if(strcmp(cmd,"speed")==0) {
|
||||||
(*idx)++;
|
(*idx)++;
|
||||||
ret= Xorriso_option_speed(xorriso, arg1, 0);
|
ret= Xorriso_option_speed(xorriso, arg1, 0);
|
||||||
|
@ -231,6 +231,7 @@ int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag);
|
|||||||
int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag);
|
int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag);
|
||||||
|
|
||||||
/* Option -end */
|
/* Option -end */
|
||||||
|
/* @param flag bit0= discard pending changes */
|
||||||
int Xorriso_option_end(struct XorrisO *xorriso, int flag);
|
int Xorriso_option_end(struct XorrisO *xorriso, int flag);
|
||||||
|
|
||||||
/* Option -iso_rr_pattern "on"|"ls"|"off" */
|
/* Option -iso_rr_pattern "on"|"ls"|"off" */
|
||||||
|
@ -1 +1 @@
|
|||||||
#define Xorriso_timestamP "2008.01.24.202206"
|
#define Xorriso_timestamP "2008.01.25.150902"
|
||||||
|
Loading…
Reference in New Issue
Block a user