X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=2db14246a106a8ab19aeff6e5219738857ac006c;hb=734efe5910e2696b2fe52370758d888998377142;hp=cbc11f774fa4beb4502b1dfaf975aae678f495ce;hpb=c33a1432ec909fcba0049c492cebbcbda21886c6;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index cbc11f7..2db1424 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -32,6 +32,7 @@
 // Set VARIANTS for in WinBoard variant feature. (With -s option this will always be reset to use "shogi".)
 #define VARIANTS ",normal,xiangqi"
 #define STDVARS "chess,chess960,crazyhouse,threecheck,giveaway,atomic,seirawan,shogi,xiangqi"
+#define EGT ",syzygypath,nalimovpath,gaviotapath,"
 
 #define DPRINT if(debug) printf
 #define EPRINT(X) { char f[999]; sprintf X; DPRINT("%s", f); fprintf(toE, "%s", f + 2*(*f == '#')); /* strip optional # prefix */ }
@@ -54,7 +55,7 @@ FILE *toE, *fromE, *fromF;
 int pid;
 
 #ifdef WIN32
-char *strcasestr (char *p, char *q) { char *r = p; while(*r) *r = tolower(*r), r++; return strstr(p, q); }
+char *strcasestr (char *p, char *q) { while(*p) { char *r=p++, *s=q; while(tolower(*r++) == tolower(*s) && *s) s++; if(!*s) return p-1; } return NULL; }
 
 WinPipe(HANDLE *hRd, HANDLE *hWr)
 {
@@ -255,7 +256,7 @@ GetChar()
 void *
 Engine2GUI()
 {
-    char line[1024], command[256];
+    char line[1024], command[256]; static char egts[999];
 
     if(fromF = fopen("DefectiveEngineOptions.ini", "r")) printf("# fake engine input\n");
     while(1) {
@@ -332,7 +333,7 @@ Engine2GUI()
 	}
 	else if(!strcmp(command, "option")) { // USI option: extract data fields
 	    char name[80], type[80], buf[1024], val[256], *q;
-	    int min=0, max=1e9;
+	    int min=0, max=1e9; *val = 0;
 	    if(p = strstr(line+6, " type ")) sscanf(p+1, "type %s", type), *p = '\n';
 	    if(p = strstr(line+6, " min "))  sscanf(p+1, "min %d", &min), *p = '\n';
 	    if(p = strstr(line+6, " max "))  sscanf(p+1, "max %d", &max), *p = '\n';
@@ -354,8 +355,13 @@ Engine2GUI()
 	    }
 	    if(!strcasecmp(name, "newgame") && !strcmp(type, "button")) { newGame++; continue; }
 	    if(!strcasecmp(name, "usemillisec")) { unit = (!strcmp(val, "false") ? 2 : 1); continue; }
+	    sprintf(buf, ",%s,", name); if(strcasestr(EGT, buf)) { buf[strlen(buf)-5] = 0; strcat(egts, buf); continue; } // collect EGT formats
 	    // pass on engine-defined option as WB option feature
 	    if(!strcmp(type, "filename")) type[4] = 0;
+	    else if(sc == 'c' && !strcmp(type, "string")) { // in UCI try to guess which strings are file or directory names
+		if(strcasestr(name, "file")) strcpy(type, "file"); else
+		if(strcasestr(name, "path") || strcasestr(name, "directory") || strcasestr(name, "folder")) strcpy(type, "path");
+	    }
 	    sprintf(buf, "feature option=\"%s -%s", name, type); q = buf + strlen(buf);
 	    if(     !strcmp(type, "file")
 	         || !strcmp(type, "string")) sprintf(q, " %s\"\n", val);
@@ -388,6 +394,7 @@ Engine2GUI()
 				else *p++ = *q++; // copy other variant names unmodified
 	    if(frc) sprintf(p, ",normal,fischerandom"), printf("feature oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling
 	    if(*varList) printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options
+	    if(*egts) { for(p=egts; *p = tolower(*p); p++); printf("feature egt=\"%s\"\n", egts+1); }
 	    printf("feature smp=1 memory=%d done=1\n", hasHash);
 	    if(unit == 2) { unit = 1; EPRINT((f, "# setoption usemillisec true\n")) }
 	    Sync(WAKEUP); // done with options