X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=main.c;h=94194f72fa81e3a3b8defda1780a9493287caef7;hb=a9ecc687f7cfb4760cd3170a6cb32261aa2a458e;hp=134a366a90fde1efbf4c6009708eb0d366accb24;hpb=683b5dc504dc5d930b617cfba09011e41e51dd16;p=polyglot.git diff --git a/main.c b/main.c index 134a366..94194f7 100644 --- a/main.c +++ b/main.c @@ -39,10 +39,10 @@ // constants -static const char * const Version = "1.4.55b"; +static const char * const Version = "1.4.59b"; static const char * const HelpMessage = "\ SYNTAX\n\ -* polyglot [configfile] [-noini] [-ec engine] [-ed enginedirectory] [-en enginename] [-log] [-lf logfile] [-hash value] [-bk book] [-pg =]* [-uci =]*\n\ +* polyglot [configfile] [-noini] [-ec engine] [-ed enginedirectory] [-en enginename] [-log true/false] [-lf logfile] [-pg =]* [-uci =]*\n\ * polyglot make-book [-pgn inputfile] [-bin outputfile] [-max-ply ply] [-min-game games] [-min-score score] [-only-white] [-only-black] [-uniform]\n\ * polyglot merge-book -in1 inputfile1 -in2 inputfile2 [-out outputfile]\n\ * polyglot info-book [-bin inputfile] [-exact]\n\ @@ -364,7 +364,7 @@ int main(int argc, char * argv[]) { if(!my_string_equal(option_get_string(Option,"SettingsFile"),"")){ if(ini_parse(ini,option_get_string(Option,"SettingsFile"))){ - my_fatal("main(): Can't open file \"%s\": %s\n", + my_fatal("main(): Can't open config file \"%s\": %s\n", option_get_string(Option,"SettingsFile"), strerror(errno)); } @@ -437,12 +437,17 @@ int main(int argc, char * argv[]) { option_set(Option,entry->name,entry->value); } + // Make sure that EngineCommand has been set + if(my_string_case_equal(option_get(Option,"EngineCommand"),"")){ + my_fatal("main(): EngineCommand not set\n"); + } + // start engine engine_open(Engine); if(!engine_active(Engine)){ - my_fatal("Could not start \"%s\"\n",option_get(Option,"EngineCommand")); + my_fatal("main(): Could not start \"%s\"\n",option_get(Option,"EngineCommand")); } // switch to UCI mode if necessary @@ -561,7 +566,7 @@ int main(int argc, char * argv[]) { argc=1; while((arg=argv[argc++])){ if(!my_string_equal(arg,"")){ - my_fatal("main(): Option: \"%s\" not found\n",argv[argc-1]); + my_fatal("main(): Incorrect use of option: \"%s\"\n",argv[argc-1]); } } @@ -629,15 +634,11 @@ void polyglot_set_option(const char *name, const char *value){ // this must be c // quit() void quit() { - my_log("POLYGLOT *** QUIT ***\n"); - if (Init && !Engine->pipex->quit_pending) { - stop_search(); Engine->pipex->quit_pending=TRUE; engine_send(Engine,"quit"); - my_log("POLYGLOT Closing engine\n"); engine_close(Engine); }