Fix multi-leg promotions

[xboard.git] / uci.c

diff --git a/uci.c b/uci.c
index 0885ee0..97c188f 100644 (file)
--- a/uci.c
+++ b/uci.c
@@ -5,6 +5,9 @@
  *
  * Copyright 2006 Alessandro Scotti
  *
+ * Enhancement Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015,
+ * 2016 Free Software Foundation, Inc.
+ *
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -18,39 +21,44 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/. 
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  *
  * ------------------------------------------------------------------------
  */
 #include <stdio.h>
+#include <ctype.h>
 #include <stdlib.h>
-
-#if HAVE_MALLOC_H
-  #include <malloc.h>
-#endif
+#include <string.h>
 
 #include "common.h"
 #include "backend.h"
+Boolean GetArgValue(char *a);
 
-
-void InitEngineUCI( const char * iniDir, ChessProgramState * cps )
+void
+InitEngineUCI (const char *iniDir, ChessProgramState *cps)
 {   // replace engine command line by adapter command with expanded meta-symbols
     if( cps->isUCI ) {
         char *p, *q;
         char polyglotCommand[MSG_SIZ];
 
+        if(cps->isUCI == 2) p = appData.ucciAdapter; else
         p = appData.adapterCommand;
         q = polyglotCommand;
         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++;
             }
-            while(*p != ' ' && *p) *s++ = *p++; // copy option name
+            while(isdigit(*p) || isalpha(*p)) *s++ = *p++; // copy option name
             *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++;