version 1.4.58b
[polyglot.git] / main.c
diff --git a/main.c b/main.c
index e49f51d..21bbe17 100644 (file)
--- a/main.c
+++ b/main.c
@@ -7,6 +7,7 @@
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <string.h>\r
+#include <time.h>\r
 \r
 #include "attack.h"\r
 #include "board.h"\r
 #include "util.h"\r
 #include "xboard2uci.h"\r
 #include "uci2uci.h"\r
+#include "ini.h"\r
+#include "util.h"\r
+\r
 \r
 // constants\r
 \r
 \r
-static const char * const Version = "1.4.36b";\r
+static const char * const Version = "1.4.58b";\r
 static const char * const HelpMessage = "\\r
 SYNTAX\n\\r
-* polyglot [configfile]\n\\r
-* polyglot -ec enginecommand\n\\r
+* polyglot [configfile] [-noini] [-ec engine] [-ed enginedirectory] [-en enginename] [-log true/false] [-lf logfile] [-pg <name>=<value>]* [-uci <name>=<value>]*\n\\r
 * polyglot make-book [-pgn inputfile] [-bin outputfile] [-max-ply ply] [-min-game games] [-min-score score] [-only-white] [-only-black] [-uniform]\n\\r
 * polyglot merge-book -in1 inputfile1 -in2 inputfile2 [-out outputfile]\n\\r
 * polyglot info-book [-bin inputfile] [-exact]\n\\r
 * polyglot dump-book [-bin inputfile] -color color [-out outputfile]\n\\r
-* polyglot [configfile] epd-test [-epd inputfile] [-min-depth depth] [-max-depth depth] [-min-time time] [-max-time time] [-depth-delta delta]\n\\r
+* polyglot [configfile] epd-test [engineoptions] [-epd inputfile] [-min-depth depth] [-max-depth depth] [-min-time time] [-max-time time] [-depth-delta delta]\n\\r
 * polyglot perft [-fen fen] [-max-depth depth]\\r
 ";\r
 \r
@@ -58,22 +61,215 @@ static bool Init;
 \r
 // prototypes\r
 \r
-static void parse_option ();\r
-static void init_book ();\r
-static bool parse_line   (char line[], char * * name_ptr, char * * value_ptr);\r
 static void stop_search  ();\r
 \r
 // functions\r
 \r
-// main()\r
+// arg_shift_left()\r
+\r
+static void arg_shift_left(char **argv, int index){\r
+    int i;\r
+    for(i=index; argv[i]!=NULL; i++){\r
+        argv[i]=argv[i+1];\r
+    }\r
+}\r
+\r
+// parse_args()\r
+\r
+static void parse_args(ini_t *ini, char **argv){\r
+    int arg_index;\r
+    char *arg;\r
+    arg_index=0;\r
+    while((arg=argv[arg_index])){\r
+        if(my_string_equal(arg,"-ec") && argv[arg_index+1]){\r
+            ini_insert_ex(ini,"PolyGlot","EngineCommand",argv[arg_index+1]);\r
+            arg_shift_left(argv,arg_index);\r
+            arg_shift_left(argv,arg_index);\r
+            continue;\r
+        }if(my_string_equal(arg,"-ed") && argv[arg_index+1]){\r
+            ini_insert_ex(ini,"PolyGlot","EngineDir",argv[arg_index+1]);\r
+            arg_shift_left(argv,arg_index);\r
+            arg_shift_left(argv,arg_index);\r
+            continue;\r
+        }\r
+        if(my_string_equal(arg,"-en") && argv[arg_index+1]){\r
+            ini_insert_ex(ini,"PolyGlot","EngineName",argv[arg_index+1]);\r
+            arg_shift_left(argv,arg_index);\r
+            arg_shift_left(argv,arg_index);\r
+            continue;\r
+        }\r
+        if(my_string_equal(arg,"-log") &&\r
+           argv[arg_index+1] &&\r
+           IS_BOOL(argv[arg_index+1])){\r
+            ini_insert_ex(ini,\r
+                          "PolyGlot",\r
+                          "Log",\r
+                          TO_BOOL(argv[arg_index+1])?"true":"false");\r
+            arg_shift_left(argv,arg_index);\r
+            arg_shift_left(argv,arg_index);\r
+            continue;\r
+        }\r
+        if(my_string_equal(arg,"-lf") && argv[arg_index+1]){\r
+            ini_insert_ex(ini,"PolyGlot","LogFile",argv[arg_index+1]);\r
+            arg_shift_left(argv,arg_index);\r
+            arg_shift_left(argv,arg_index);\r
+            continue;\r
+        }\r
+        if(my_string_equal(arg,"-wb") &&\r
+           argv[arg_index+1]&&\r
+           IS_BOOL(argv[arg_index+1])){\r
+               ini_insert_ex(ini,"PolyGlot",\r
+                             "OnlyWbOptions",\r
+                             TO_BOOL(argv[arg_index+1])?"true":"false");\r
+               arg_shift_left(argv,arg_index);\r
+               arg_shift_left(argv,arg_index);\r
+               continue;\r
+        }\r
+        if((my_string_equal(arg,"-pg")||my_string_equal(arg,"-uci")) &&\r
+           argv[arg_index+1]){\r
+            int ret;\r
+            char section[StringSize];\r
+            char name[StringSize];\r
+            char value[StringSize];\r
+            ret=ini_line_parse(argv[arg_index+1],section,name,value);\r
+            if(ret==NAME_VALUE){\r
+                if(my_string_equal(arg,"-pg")){\r
+                    ini_insert_ex(ini,"PolyGlot",name,value);\r
+                }else{\r
+                    ini_insert_ex(ini,"Engine",name,value);\r
+                }\r
+            }\r
+            arg_shift_left(argv,arg_index);\r
+            arg_shift_left(argv,arg_index);\r
+            continue;\r
+        }\r
+        arg_index++;\r
+    }\r
+}\r
+\r
+\r
+// make_ini()\r
+\r
+static void make_ini(ini_t *ini){\r
+    option_t *opt;\r
+    ini_insert_ex(ini,"polyglot",\r
+                 "EngineCommand",\r
+                 option_get(Option,"EngineCommand"));\r
+    ini_insert_ex(ini,"polyglot",\r
+                 "EngineDir",\r
+                 option_get(Option,"EngineDir"));\r
+    option_start_iter(Option);\r
+    while((opt=option_next(Option))){\r
+        if(my_string_case_equal(opt->name,"SettingsFile")) continue;\r
+        if(my_string_case_equal(opt->name,"EngineCommand")) continue;\r
+        if(my_string_case_equal(opt->name,"EngineDir")) continue;\r
+        if(!my_string_equal(opt->value,opt->default_)&& !IS_BUTTON(opt->type))\r
+        {\r
+            ini_insert_ex(ini,"polyglot",opt->name,opt->value);\r
+        }\r
+    }\r
+    option_start_iter(Uci->option);\r
+    while((opt=option_next(Uci->option))){\r
+        if(!strncmp(opt->name,"UCI_",4) &&\r
+            !my_string_case_equal(opt->name,"UCI_LimitStrength") &&\r
+            !my_string_case_equal(opt->name,"UCI_Elo"))continue;\r
+        if(!my_string_equal(opt->value,opt->default_)&&\r
+           !IS_BUTTON(opt->type)){\r
+            ini_insert_ex(ini,"engine",opt->name,opt->value);\r
+        }\r
+    }\r
+}\r
 \r
-int main(int argc, char * argv[]) {\r
 \r
+// write_ini()\r
+\r
+static void write_ini(const char *filename,\r
+                        ini_t *ini){\r
+  // TODO Quote, dequote\r
+    const char *quote;\r
+    ini_entry_t *entry;\r
+    char tmp[StringSize];\r
+    char tmp1[StringSize];\r
+    char tmp2[StringSize];\r
+    FILE *f;\r
+    time_t t=time(NULL);\r
+    f=fopen(filename,"w");\r
+    if(!f){\r
+      gui_send(GUI,"tellusererror write_ini(): %s: %s.",filename,strerror(errno));\r
+      my_log("POLYGLOT write_ini(): %s: %s.\n",filename,strerror(errno));\r
+      return;\r
+    }\r
+    fprintf(f,"; Created: %s\n",ctime(&t));\r
+    fprintf(f,"[PolyGlot]\n");\r
+    ini_start_iter(ini);\r
+    while((entry=ini_next(ini))){\r
+      if(my_string_case_equal(entry->section,"polyglot")){\r
+         my_quote(tmp1,entry->name,ini_specials);\r
+         my_quote(tmp2,entry->value,ini_specials);\r
+          snprintf(tmp,sizeof(tmp),"%s=%s\n",\r
+                   tmp1,\r
+                   tmp2);\r
+       tmp[sizeof(tmp)-1]='\0';\r
+       fprintf(f,"%s",tmp);\r
+      }\r
+    }\r
+    fprintf(f,"[Engine]\n");\r
+    ini_start_iter(ini);\r
+    while((entry=ini_next(ini))){\r
+      if(my_string_case_equal(entry->section,"engine")){\r
+        my_quote(tmp1,entry->name,ini_specials);\r
+       my_quote(tmp2,entry->value,ini_specials);\r
+       snprintf(tmp,sizeof(tmp),"%s=%s\n",\r
+                     tmp1,\r
+                     tmp2);\r
+       tmp[sizeof(tmp)-1]='\0';\r
+       fprintf(f,"%s",tmp);\r
+      }\r
+    }\r
+    fclose(f);\r
+}\r
+\r
+// welcome_message()\r
+\r
+void welcome_message(char *buf){\r
     if(!DEBUG){\r
-        printf("PolyGlot %s by Fabien Letouzey.\n",Version);\r
+        sprintf(buf,\r
+                "PolyGlot %s by Fabien Letouzey.\n",\r
+                Version);\r
     }else{\r
-        printf("PolyGlot %s by Fabien Letouzey (debug build).\n",Version);\r
+        sprintf(buf,\r
+                "PolyGlot %s by Fabien Letouzey (debug build).\n",\r
+                Version);\r
     }\r
+}\r
+\r
+int wb_select(){\r
+    option_t *opt;\r
+    option_start_iter(Option);\r
+    while((opt=option_next(Option))){\r
+        opt->mode&=~XBOARD;\r
+        if(opt->mode & XBSEL){\r
+            opt->mode|=XBOARD; \r
+        }\r
+    }\r
+}\r
+\r
+// main()\r
+\r
+int main(int argc, char * argv[]) {\r
+    ini_t ini[1], ini_command[1];\r
+    ini_entry_t *entry;\r
+    char *arg;\r
+    int arg_index;\r
+    bool NoIni;\r
+    option_t *opt;\r
+    char welcome[StringSize];\r
+\r
+\r
+    welcome_message(welcome);\r
\r
+    printf("%s",welcome);\r
+\r
 \r
     if(argc>=2 && ((my_string_case_equal(argv[1],"help")) || (my_string_case_equal(argv[1],"-help")) || (my_string_case_equal(argv[1],"--help")) ||  (my_string_case_equal(argv[1],"-h")) ||  my_string_case_equal(argv[1],"/?"))){\r
         printf("%s\n",HelpMessage);\r
@@ -84,6 +280,8 @@ int main(int argc, char * argv[]) {
 \r
     Init = FALSE;\r
 \r
+    gui_init(GUI);\r
+\r
     util_init();\r
     option_init_pg();\r
     \r
@@ -92,10 +290,13 @@ int main(int argc, char * argv[]) {
     attack_init();\r
     \r
     hash_init();\r
-    \r
+\r
     my_random_init();\r
 \r
-        // build book\r
+    ini_init(ini);\r
+    ini_init(ini_command);\r
+\r
+        // book utilities: do not touch these\r
     \r
     if (argc >= 2 && my_string_equal(argv[1],"make-book")) {\r
         book_make(argc,argv);\r
@@ -107,72 +308,297 @@ int main(int argc, char * argv[]) {
         return EXIT_SUCCESS;\r
     }\r
 \r
-       if (argc >= 2 && my_string_equal(argv[1],"merge-book")) {\r
-      book_merge(argc,argv);\r
-      return EXIT_SUCCESS;\r
-   }\r
-\r
-   if (argc >= 2 && my_string_equal(argv[1],"dump-book")) {\r
-      book_dump(argc,argv);\r
-      return EXIT_SUCCESS;\r
-   }\r
+    if (argc >= 2 && my_string_equal(argv[1],"dump-book")) {\r
+        book_dump(argc,argv);\r
+        return EXIT_SUCCESS;\r
+    }\r
+    \r
+    if (argc >= 2 && my_string_equal(argv[1],"info-book")) {\r
+        book_info(argc,argv);\r
+        return EXIT_SUCCESS;\r
+    }\r
 \r
-   if (argc >= 2 && my_string_equal(argv[1],"info-book")) {\r
-      book_info(argc,argv);\r
-      return EXIT_SUCCESS;\r
-   }\r
+        // perft\r
     \r
     if (argc >= 2 && my_string_equal(argv[1],"perft")) {\r
         do_perft(argc,argv);\r
         return EXIT_SUCCESS;\r
     }\r
     \r
-    if (argc >= 3 && my_string_equal(argv[1],"-ec")) {\r
-        option_set(Option,"EngineCommand",argv[2]);\r
-        engine_open(Engine);\r
-        if(!engine_active(Engine)){\r
-            my_fatal("Could not start \"%s\"\n",\r
-                     option_get(Option,"EngineCommand"));\r
+        // What is the config file? This is very hacky right now.\r
+\r
+        // Do we want a config file at all?\r
+\r
+    arg_index=0;\r
+    NoIni=FALSE;\r
+    while((arg=argv[arg_index++])){\r
+        if(my_string_equal(arg,"-noini")){\r
+            NoIni=TRUE;\r
+            break;\r
         }\r
-        Init=TRUE;\r
-        gui_init(GUI);\r
-        uci_open(Uci,Engine);\r
-        if (my_string_equal(option_get_string(Option,"EngineName"),"<empty>")) {\r
-            option_set(Option,"EngineName",Uci->name);\r
+    }\r
+    arg_shift_left(argv,arg_index-1);\r
+    parse_args(ini_command,argv+1);\r
+    if(NoIni){\r
+        option_set(Option,"SettingsFile","<empty>");\r
+    }\r
+\r
+        // Ok see if first argument looks like config file\r
+    \r
+    if(argv[1] && !my_string_equal(argv[1],"epd-test") && !(argv[1][0]=='-')){\r
+                // first argument must be  config file\r
+        if(!NoIni){\r
+            option_set(Option,"SettingsFile",argv[1]);\r
+        }else{\r
+                // ignore\r
         }\r
-        mainloop();\r
-        return EXIT_SUCCESS; \r
+        arg_shift_left(argv,1);\r
+    }else{\r
+            // Config file is the default.\r
+            // This has already been set above or in "option_init_pg()"\r
     }\r
+\r
+\r
+\r
+        // if we use a config file: load it!\r
     \r
-        // read options\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 config file \"%s\": %s\n",\r
+                   option_get_string(Option,"SettingsFile"),\r
+                   strerror(errno));\r
+        }\r
+    }\r
 \r
+        // Extract some important options\r
+\r
+    if((entry=ini_find(ini,"polyglot","EngineCommand"))){\r
+        option_set(Option,entry->name,entry->value);\r
+    }\r
+    if((entry=ini_find(ini,"polyglot","EngineDir"))){\r
+        option_set(Option,entry->name,entry->value);\r
+    }\r
+    if((entry=ini_find(ini,"polyglot","EngineName"))){\r
+        option_set(Option,entry->name,entry->value);\r
+    }\r
+    if((entry=ini_find(ini,"polyglot","Log"))){\r
+        polyglot_set_option(entry->name,entry->value);\r
+    }\r
+    if((entry=ini_find(ini,"polyglot","LogFile"))){\r
+        polyglot_set_option(entry->name,entry->value);\r
+    }\r
     \r
-    if (argc == 2) option_set(Option,"OptionFile",argv[1]); // HACK for compatibility\r
+        // Concession to WB 4.4.0\r
+        // Treat "polyglot_1st.ini" and "polyglot_2nd.ini" specially\r
+\r
+    if(option_get_bool(Option,"WbWorkArounds3")){\r
+        const char *SettingsFile=option_get(Option,"SettingsFile");\r
+        if(strstr(SettingsFile,"polyglot_1st.ini")||\r
+           strstr(SettingsFile,"polyglot_2nd.ini")){\r
+            option_set(Option,"SettingsFile","<empty>");\r
+        }\r
+    }\r
+\r
+        // Look at command line for logging option. It is important\r
+        // to start logging as soon as possible.\r
+\r
+     if((entry=ini_find(ini_command,"PolyGlot","Log"))){\r
+         option_set(Option,entry->name,entry->value);\r
+    }\r
+    if((entry=ini_find(ini_command,"PolyGlot","LogFile"))){\r
+        option_set(Option,entry->name,entry->value);\r
+    }\r
+    \r
+       // start logging if required\r
+    \r
+    if (option_get_bool(Option,"Log")) {\r
+        my_log_open(option_get_string(Option,"LogFile"));\r
+    }\r
 \r
-    parse_option(); // HACK: also launches the engine\r
+        // log welcome stuff\r
+    \r
+    my_log("%s",welcome);\r
+    my_log("POLYGLOT *** START ***\n");\r
+    if(!my_string_equal(option_get_string(Option,"SettingsFile"),"<empty>")){\r
+        my_log("POLYGLOT INI file \"%s\"\n",option_get_string(Option,"SettingsFile"));\r
+    }\r
+\r
+\r
+        // scavenge command line for options necessary to start the engine\r
+\r
+\r
+    if((entry=ini_find(ini_command,"PolyGlot","EngineCommand"))){\r
+        option_set(Option,entry->name,entry->value);\r
+    }\r
+    if((entry=ini_find(ini_command,"PolyGlot","EngineDir"))){\r
+        option_set(Option,entry->name,entry->value);\r
+    }\r
+    if((entry=ini_find(ini_command,"PolyGlot","EngineName"))){\r
+        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("main(): Could not start \"%s\"\n",option_get(Option,"EngineCommand"));\r
+    }\r
+\r
+        // switch to UCI mode if necessary\r
+    \r
+    if (option_get_bool(Option,"UCI")) {\r
+        my_log("POLYGLOT *** Switching to UCI mode ***\n");\r
+    }\r
+\r
+        // initialize uci parsing and send uci command. \r
+        // Parse options and wait for uciok\r
+    \r
+    // XXX\r
+    uci_open(Uci,Engine);\r
+\r
+    option_set_default(Option,"EngineName",Uci->name);\r
+\r
+        // get engine name from engine if not supplied in config file or on\r
+        // the command line\r
+\r
+    if (my_string_equal(option_get_string(Option,"EngineName"),"<empty>")) {\r
+        option_set(Option,"EngineName",Uci->name);\r
+    }\r
+\r
+\r
+        // In the case we have been invoked with NoIni or StandardIni\r
+        // we still have to load a config file.\r
+\r
+    if(my_string_equal(option_get_string(Option,"SettingsFile"),"<empty>")){\r
+\r
+            //  construct the name of the ConfigFile from the EngineName\r
+        \r
+        char tmp[StringSize];\r
+        char option_file[StringSize];\r
+        int i;\r
+        snprintf(tmp,sizeof(tmp),"%s.ini",\r
+                 option_get_string(Option,"EngineName"));\r
+        tmp[sizeof(tmp)-1]='\0';\r
+        for(i=0;i<strlen(tmp);i++){\r
+            if(tmp[i]==' '){\r
+                tmp[i]='_';\r
+            }\r
+        }\r
+        my_path_join(option_file,\r
+                     option_get_string(Option,"SettingsDir"),\r
+                     tmp);\r
+    // Load the config file\r
+        option_set(Option,"SettingsFile",option_file);\r
+\r
+        my_log("POLYGLOT INI file \"%s\"\n",option_get_string(Option,"SettingsFile"));\r
+        if(ini_parse(ini,option_file)){\r
+            my_log("POLYGLOT Unable to open %s\n",\r
+                   option_get_string(Option,"SettingsFile")); \r
+        }\r
+    }\r
+\r
+\r
+    // Parse the command line and merge remaining options.\r
+\r
+    ini_start_iter(ini_command);\r
+    while((entry=ini_next(ini_command))){\r
+        ini_insert(ini,entry);\r
+    }\r
+\r
+        // Remind the reader about the options that are now in effect.\r
+\r
+    my_log("POLYGLOG OPTIONS \n");\r
+    ini_disp(ini);\r
+\r
+            // extract PG options\r
+    \r
+    ini_start_iter(ini);\r
+    while((entry=ini_next(ini))){\r
+        if(my_string_case_equal(entry->section,"polyglot")){\r
+            opt=option_find(Option,entry->name);\r
+            if(opt && !IS_BUTTON(opt->type)){\r
+                polyglot_set_option(entry->name,entry->value);\r
+            }\r
+        }\r
+    }\r
+\r
+        // Cater to our biggest customer:-)\r
+    \r
+    if(option_get_bool(Option,"OnlyWbOptions")){\r
+        wb_select();\r
+    }\r
+\r
+        // done initializing\r
+    \r
+    Init = TRUE;\r
+    \r
+        // collect engine options from config file(s) and send to engine\r
+    \r
+    ini_start_iter(ini);\r
+    while((entry=ini_next(ini))){\r
+        if(my_string_case_equal(entry->section,"engine")){\r
+                // also updates value in Uci->option\r
+            uci_send_option(Uci,entry->name,"%s",entry->value);\r
+        }\r
+    }\r
+\r
+    \r
     \r
         // EPD test\r
     \r
-    if (argc >= 2 && my_string_equal(argv[1],"epd-test")){\r
-        epd_test(argc,argv);\r
-        return EXIT_SUCCESS;\r
-    }else if(argc >= 3 && my_string_equal(argv[2],"epd-test")){\r
-        epd_test(argc-1,argv+1);\r
+    if (argv[1] && my_string_equal(argv[1],"epd-test")){\r
+        argc=0;\r
+        while((arg=argv[argc++]));\r
+        epd_test(argc-1,argv);\r
         return EXIT_SUCCESS;\r
     }\r
     \r
-    if (argc >= 3) my_fatal("Too many arguments\n");\r
+        // Anything that hasn't been parsed yet is a syntax error\r
+        // It seems that XBoard sometimes passes empty strings as arguments\r
+        // to PolyGlot. We ignore these. \r
 \r
+    argc=1;\r
+    while((arg=argv[argc++])){\r
+        if(!my_string_equal(arg,"")){\r
+            my_fatal("main(): Incorrect use of option: \"%s\"\n",argv[argc-1]);\r
+        }\r
+    }\r
 \r
-    init_book();\r
-    gui_init(GUI);\r
+    //    gui_init(GUI);\r
     mainloop();\r
     return EXIT_SUCCESS; \r
 }\r
 \r
-// polyglot_set_option\r
-\r
-void polyglot_set_option(char *name, char *value){ // this must be cleaned up!\r
+// polyglot_set_option()\r
+\r
+void polyglot_set_option(const char *name, const char *value){ // this must be cleaned up!\r
+    ini_t ini[1];\r
+    int ret;\r
+    ini_init(ini);\r
+    my_log("POLYGLOT Setting PolyGlot option \"%s=%s\"\n",name,value);\r
+    if(my_string_case_equal(name,"Save")){\r
+        ret=my_mkdir(option_get(Option,"SettingsDir"));\r
+        if(ret){\r
+            my_log("POLYGLOT polyglot_set_option(): %s: %s\n",\r
+                   option_get(Option,"SettingsDir"),\r
+                   strerror(errno));\r
+        }\r
+        make_ini(ini);\r
+        write_ini(option_get(Option,"SettingsFile"),ini);\r
+        return;\r
+    }\r
+//    if(my_string_equal(option_get(Option,name),value)){\r
+//        my_log("Not setting PolyGlot option \"%s\" "\r
+//               "since it already as the correct value.\n",\r
+//               name);\r
+//        return;\r
+//    }\r
     option_set(Option,name,value);\r
     if(option_get_bool(Option,"Book")&&(my_string_case_equal(name,"BookFile")||my_string_case_equal(name,"Book"))){\r
         my_log("POLYGLOT *** SETTING BOOK ***\n");\r
@@ -184,8 +610,8 @@ void polyglot_set_option(char *name, char *value){ // this must be cleaned up!
             my_log("POLYGLOT Unable to open book \"%s\"\n",option_get_string(Option,"BookFile"));\r
         }\r
     }else if(option_get_bool(Option,"Log")&&(my_string_case_equal(name,"LogFile") ||my_string_case_equal(name,"Log"))){\r
-        my_log("POLYGLOT *** SETTING LOGFILE ***\n");\r
-        my_log("POLYGLOT LOGFILE \"%s\"\n",option_get_string(Option,"LogFile"));\r
+        my_log("POLYGLOT *** SWITCHING LOGFILE ***\n");\r
+        my_log("POLYGLOT NEW LOGFILE \"%s\"\n",option_get_string(Option,"LogFile"));\r
         my_log_close();\r
         my_log_open(option_get_string(Option,"LogFile"));\r
     }else if(option_get_bool(Option,"UseNice") &&(my_string_case_equal(name,"NiceValue")||my_string_case_equal(name,"UseNice"))){\r
@@ -204,160 +630,19 @@ void polyglot_set_option(char *name, char *value){ // this must be cleaned up!
 }\r
 \r
 \r
-// init_book()\r
-\r
-static void init_book(){\r
-    book_clear();\r
-    if (option_get_bool(Option,"Book")){\r
-        my_log("POLYGLOT *** SETTING BOOK ***\n");\r
-        my_log("POLYGLOT BOOK \"%s\"\n",option_get_string(Option,"BookFile"));\r
-        book_open(option_get_string(Option,"BookFile"));\r
-        if(!book_is_open()){\r
-            my_log("POLYGLOT Unable to open book \"%s\"\n",\r
-                   option_get_string(Option,"BookFile"));\r
-        }\r
-    }\r
-}\r
-\r
-// parse_option()\r
-\r
-static void parse_option() {\r
-\r
-    const char * file_name;\r
-    FILE * file;\r
-    char line[256];\r
-    char * name, * value;\r
-    file_name = option_get_string(Option,"OptionFile");\r
-    \r
-    file = fopen(file_name,"r");\r
-    if (file == NULL) {\r
-        my_fatal("Can't open file \"%s\": %s\n",file_name,strerror(errno));\r
-    }\r
-    \r
-        // PolyGlot options (assumed first)\r
-    \r
-   while (TRUE) {\r
-       \r
-       if (!my_file_read_line(file,line,256)) {\r
-           my_fatal("parse_option(): missing [Engine] section\n");\r
-       }\r
-       \r
-       if (my_string_case_equal(line,"[engine]")) break;\r
-       \r
-       if (parse_line(line,&name,&value)) {\r
-           option_set(Option,name,value);\r
-           option_set_default(Option,name,value);\r
-       }\r
-   }\r
-   \r
-   if (option_get_bool(Option,"Log")) {\r
-       my_log_open(option_get_string(Option,"LogFile"));\r
-   }\r
-   \r
-   if(!DEBUG){\r
-       my_log("PolyGlot %s by Fabien Letouzey\n",Version);\r
-   }else{\r
-       my_log("PolyGlot %s by Fabien Letouzey (debug build)\n",Version);\r
-   }\r
-\r
-   my_log("POLYGLOT *** START ***\n");\r
-   my_log("POLYGLOT INI file \"%s\"\n",file_name);\r
-   engine_open(Engine);\r
-   if(!engine_active(Engine)){\r
-       my_fatal("Could not start \"%s\"\n",option_get(Option,"EngineCommand"));\r
-   }\r
-\r
-   if (option_get_bool(Option,"UCI")) {\r
-       my_log("POLYGLOT *** Switching to UCI mode ***\n");\r
-   }\r
-   uci_open(Uci,Engine);\r
-   Init = TRUE;\r
-   while (my_file_read_line(file,line,256)) {\r
-       if (line[0] == '[') my_fatal("parse_option(): unknown section %s\n",line);\r
-       if (parse_line(line,&name,&value)) {\r
-           uci_send_option(Uci,name,"%s",value);\r
-               //to get a decent display in winboard_x we need to now if an engine really is doing multipv analysis\r
-               // "multipv 1" in the pv is meaningless,f.i. toga sends that all the time\r
-               //therefore check if MultiPV is set to a decent value in the polyglot ini file\r
-           if(my_string_case_equal(name,"MultiPV") && atoi(value)>1)  Uci->multipv_mode=TRUE;\r
-       }\r
-   }\r
-   if (my_string_equal(option_get_string(Option,"EngineName"),"<empty>")) {\r
-       option_set(Option,"EngineName",Uci->name);\r
-   }\r
-   \r
-   fclose(file);\r
-}\r
-\r
-// parse_line()\r
-\r
-static bool parse_line(char line[], char * * name_ptr, char * * value_ptr) {\r
-    \r
-    char * ptr;\r
-    char * name, * value;\r
-    \r
-    ASSERT(line!=NULL);\r
-    ASSERT(name_ptr!=NULL);\r
-    ASSERT(value_ptr!=NULL);\r
-    \r
-        // remove comments\r
-    \r
-    ptr = strchr(line,';');\r
-    if (ptr != NULL) *ptr = '\0';\r
-    \r
-    ptr = strchr(line,'#');\r
-    if (ptr != NULL) *ptr = '\0';\r
-    \r
-        // split at '='\r
-    \r
-    ptr = strchr(line,'=');\r
-    if (ptr == NULL) return FALSE;\r
-    \r
-    name = line;\r
-    value = ptr+1;\r
-   \r
-        // cleanup name\r
-    \r
-    while (*name == ' ') name++; // remove leading spaces\r
-    \r
-    while (ptr > name && ptr[-1] == ' ') ptr--; // remove trailing spaces\r
-    *ptr = '\0';\r
-    \r
-    if (*name == '\0') return FALSE;\r
-    \r
-        // cleanup value\r
-    \r
-    ptr = &value[strlen(value)]; // pointer to string terminator\r
-    \r
-    while (*value == ' ') value++; // remove leading spaces\r
-    \r
-    while (ptr > value && ptr[-1] == ' ') ptr--; // remove trailing spaces\r
-    *ptr = '\0';\r
-    \r
-    if (*value == '\0') return FALSE;\r
-   \r
-        // end\r
-    \r
-    *name_ptr = name;\r
-    *value_ptr = value;\r
-    \r
-    return TRUE;\r
-}\r
 \r
 // quit()\r
 \r
 void quit() {\r
-\r
     my_log("POLYGLOT *** QUIT ***\n");\r
-    \r
-    if (Init) {\r
-        \r
+    if (Init && !Engine->pipex->quit_pending) {\r
         stop_search();\r
+       Engine->pipex->quit_pending=TRUE;\r
         engine_send(Engine,"quit");\r
-        my_log("POLYGLOT Closing engine\n");\r
         engine_close(Engine);\r
         \r
     }\r
+    my_sleep(200);\r
     my_log("POLYGLOT Calling exit\n");\r
     exit(EXIT_SUCCESS);\r
 }\r
@@ -382,5 +667,5 @@ static void stop_search() {
 }\r
 \r
 \r
-// end of main.cpp\r
+// end of main.c\r
 \r