From bbfc05161cd4a4ba3a8fdc33a6baa5eef41ce600 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 14 Nov 2007 17:52:09 +0000 Subject: [PATCH] Corrected premature abort bug with misspelled command words --- libisoburn/trunk/test/xorriso.c | 9 +++++---- libisoburn/trunk/test/xorriso_timestamp.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libisoburn/trunk/test/xorriso.c b/libisoburn/trunk/test/xorriso.c index a6de9c10..e0f403b7 100644 --- a/libisoburn/trunk/test/xorriso.c +++ b/libisoburn/trunk/test/xorriso.c @@ -6077,17 +6077,17 @@ next_command:; printf("XORRISO: -test : enter a line for test parsing\n"); ret= Xorriso_dialog_input(xorriso,line,sizeof(line),4); if(ret<=0) - goto ex; + goto eval_any_problems; ret= Sfile_make_argv(xorriso->progname, line, &hargc, &hargv, 4|8); if(ret<=0) { fprintf(stderr, "--- Malformed quotation marking encountered\n"); - goto ex; + goto eval_any_problems; } for(i=0; iresult_line,"%d : |%s|\n", i, hargv[i]); ret= Xorriso_result(xorriso,0); if(ret<=0) - goto ex; + goto eval_any_problems; } Sfile_make_argv(xorriso->progname, line, &hargc, &hargv, 2); @@ -6119,7 +6119,7 @@ unknown_option:; sprintf(xorriso->info_text+strlen(xorriso->info_text), "=== '%s'\n",cmd); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); - {ret= 0; goto ex;} + {ret= 0; goto eval_any_problems;} } else { goto unknown_option; @@ -6130,6 +6130,7 @@ unknown_option:; Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); } +eval_any_problems: ret= Xorriso_eval_problem_status(xorriso, ret, 0); if(ret<0) return(ret); diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h index 75dbd689..118eefc6 100644 --- a/libisoburn/trunk/test/xorriso_timestamp.h +++ b/libisoburn/trunk/test/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2007.11.14.143119" +#define Xorriso_timestamP "2007.11.14.175446"