version 1.4.56b

[polyglot.git] / main.c

diff --git a/main.c b/main.c
index 134a366..a98829d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -39,7 +39,7 @@
 // constants\r
 \r
 \r
-static const char * const Version = "1.4.55b";\r
+static const char * const Version = "1.4.56b";\r
 static const char * const HelpMessage = "\\r
 SYNTAX\n\\r
 * polyglot [configfile] [-noini] [-ec engine] [-ed enginedirectory] [-en enginename] [-log] [-lf logfile] [-hash value] [-bk book] [-pg <name>=<value>]* [-uci <name>=<value>]*\n\\r
@@ -364,7 +364,7 @@ int main(int argc, char * argv[]) {
     \r
     if(!my_string_equal(option_get_string(Option,"SettingsFile"),"<empty>")){\r
         if(ini_parse(ini,option_get_string(Option,"SettingsFile"))){\r
-            my_fatal("main(): Can't open file \"%s\": %s\n",\r
+            my_fatal("main(): Can't open config file \"%s\": %s\n",\r
                    option_get_string(Option,"SettingsFile"),\r
                    strerror(errno));\r
         }\r
@@ -437,12 +437,17 @@ int main(int argc, char * argv[]) {
         option_set(Option,entry->name,entry->value);\r
     }\r
 \r
+    // Make sure that EngineCommand has been set\r
+    if(my_string_case_equal(option_get(Option,"EngineCommand"),"<empty>")){\r
+      my_fatal("main(): EngineCommand not set\n");\r
+    }\r
+\r
         // start engine\r
     \r
     engine_open(Engine);\r
 \r
     if(!engine_active(Engine)){\r
-        my_fatal("Could not start \"%s\"\n",option_get(Option,"EngineCommand"));\r
+        my_fatal("main(): Could not start \"%s\"\n",option_get(Option,"EngineCommand"));\r
     }\r
 \r
         // switch to UCI mode if necessary\r
@@ -561,7 +566,7 @@ int main(int argc, char * argv[]) {
     argc=1;\r
     while((arg=argv[argc++])){\r
         if(!my_string_equal(arg,"")){\r
-            my_fatal("main(): Option: \"%s\" not found\n",argv[argc-1]);\r
+            my_fatal("main(): Incorrect use of option: \"%s\"\n",argv[argc-1]);\r
         }\r
     }\r
 \r
@@ -629,11 +634,8 @@ void polyglot_set_option(const char *name, const char *value){ // this must be c
 // quit()\r
 \r
 void quit() {\r
-\r
     my_log("POLYGLOT *** QUIT ***\n");\r
-    \r
     if (Init && !Engine->pipex->quit_pending) {\r
-        \r
         stop_search();\r
        Engine->pipex->quit_pending=TRUE;\r
         engine_send(Engine,"quit");\r