Add file-browser option to just return name

[xboard.git] / uci.c

diff --git a/uci.c b/uci.c
index 0885ee0..f78fb2c 100644 (file)
--- a/uci.c
+++ b/uci.c
@@ -24,14 +24,11 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
  */
 #include <stdio.h>
 #include <stdlib.h>

-
-#if HAVE_MALLOC_H
-  #include <malloc.h>
-#endif
+#include <string.h>

 
 #include "common.h"
 #include "backend.h"
 
 #include "common.h"
 #include "backend.h"

-
+Boolean GetArgValue(char *a);                          

 
 void InitEngineUCI( const char * iniDir, ChessProgramState * cps )
 {   // replace engine command line by adapter command with expanded meta-symbols
 
 void InitEngineUCI( const char * iniDir, ChessProgramState * cps )
 {   // replace engine command line by adapter command with expanded meta-symbols


@@ -44,13 +41,18 @@ void InitEngineUCI( const char * iniDir, ChessProgramState * cps )
         while(*p) {
           if(*p == '\\') p++; else
           if(*p == '%') { // substitute marker
         while(*p) {
           if(*p == '\\') p++; else
           if(*p == '%') { // substitute marker

-            char argName[MSG_SIZ], *s = argName;
+            char argName[MSG_SIZ], buf[MSG_SIZ], *s = buf;

             if(*++p == '%') { // second %, expand as f or s in option name (e.g. %%cp -> fcp)
               *s++ = cps == &first ? 'f' : 's';
               p++;
             }
             if(*++p == '%') { // second %, expand as f or s in option name (e.g. %%cp -> fcp)
               *s++ = cps == &first ? 'f' : 's';
               p++;
             }

-            while(*p != ' ' && *p) *s++ = *p++; // copy option name
+            while(*p >= '0' && *p) *s++ = *p++; // copy option name

             *s = NULLCHAR;
             *s = NULLCHAR;

+            if(cps == &second) { // change options for first into those for second engine
+              if(strstr(buf, "first") == buf) sprintf(argName, "second%s", buf+5); else
+              if(buf[0] == 'f') sprintf(argName, "s%s", buf+1); else
+               safeStrCpy(argName, buf, sizeof(argName)/sizeof(argName[0]));
+            } else safeStrCpy(argName, buf, sizeof(argName)/sizeof(argName[0]));

             if(GetArgValue(argName)) { // look up value of option with this name
               s = argName;
               while(*s) *q++ = *s++;
             if(GetArgValue(argName)) { // look up value of option with this name
               s = argName;
               while(*s) *q++ = *s++;