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

Corrected premature abort bug with misspelled command words

Browse Source
This commit is contained in:
Thomas Schmitt 2007-11-14 17:52:09 +00:00
parent 146debc163
commit 7be61dca7c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/xorriso.c
View File

@ -6077,17 +6077,17 @@ next_command:;
printf("XORRISO: -test : enter a line for test parsing\n"); printf("XORRISO: -test : enter a line for test parsing\n");
ret= Xorriso_dialog_input(xorriso,line,sizeof(line),4); ret= Xorriso_dialog_input(xorriso,line,sizeof(line),4);
if(ret<=0) if(ret<=0)
goto ex; goto eval_any_problems;
ret= Sfile_make_argv(xorriso->progname, line, &hargc, &hargv, 4|8); ret= Sfile_make_argv(xorriso->progname, line, &hargc, &hargv, 4|8);
if(ret<=0) { if(ret<=0) {
fprintf(stderr, "--- Malformed quotation marking encountered\n"); fprintf(stderr, "--- Malformed quotation marking encountered\n");
goto ex; goto eval_any_problems;
} }
for(i=0; i<hargc; i++) { for(i=0; i<hargc; i++) {
sprintf(xorriso->result_line,"%d : |%s|\n", i, hargv[i]); sprintf(xorriso->result_line,"%d : |%s|\n", i, hargv[i]);
ret= Xorriso_result(xorriso,0); ret= Xorriso_result(xorriso,0);
if(ret<=0) if(ret<=0)
goto ex; goto eval_any_problems;
} }
Sfile_make_argv(xorriso->progname, line, &hargc, &hargv, 2); Sfile_make_argv(xorriso->progname, line, &hargc, &hargv, 2);
@ -6119,7 +6119,7 @@ unknown_option:;
sprintf(xorriso->info_text+strlen(xorriso->info_text), sprintf(xorriso->info_text+strlen(xorriso->info_text),
"=== '%s'\n",cmd); "=== '%s'\n",cmd);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
{ret= 0; goto ex;} {ret= 0; goto eval_any_problems;}
} else { } else {
goto unknown_option; goto unknown_option;
@ -6130,6 +6130,7 @@ unknown_option:;
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
} }
eval_any_problems:
ret= Xorriso_eval_problem_status(xorriso, ret, 0); ret= Xorriso_eval_problem_status(xorriso, ret, 0);
if(ret<0) if(ret<0)
return(ret); return(ret);

2
test/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2007.11.14.143119" #define Xorriso_timestamP "2007.11.14.175446"