From b7c746a0f37859a73d49a9cdb03cf3b32ce1391e Mon Sep 17 00:00:00 2001
From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Sun, 12 Feb 2012 22:47:44 +0100
Subject: [PATCH] Fix some spurious output

Not all debug prints towards the GUI were controlled through the
"UCI2WB debug output" option. This is now repaired. The method for
matching an info string is made a bit more efficient, by only looking
at the beginning.
---
 UCI2WB.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/UCI2WB.c b/UCI2WB.c
index 10f4dd6..53b2f19 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -82,13 +82,13 @@ StartSearch(char *ponder)
 	int nr = moveNr + (ponder[0] != 0); // we ponder for one move ahead!
 	fprintf(toE, "\ngo btime %d wtime %d", stm == BLACK ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ sc=='s' ? myTime : hisTime);
 	DPRINT(    "\n# go btime %d wtime %d", stm == BLACK ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ sc=='s' ? myTime : hisTime);
-	if(sTime > 0) fprintf(toE, " movetime %d", sTime),printf(" movetime %d", sTime); else
-	if(mps) fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2),printf(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2);
-	if(inc && !suffix) fprintf(toE, " winc %d binc %d", inc, inc),printf(" winc %d binc %d", inc, inc);
-	if(depth > 0) fprintf(toE, " depth %d", depth),printf(" depth %d", depth);
-        if(suffix) fprintf(toE, suffix, inc),printf(suffix, inc);
+	if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else
+	if(mps) { fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2); DPRINT(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2); }
+	if(inc && !suffix) { fprintf(toE, " winc %d binc %d", inc, inc); DPRINT(" winc %d binc %d", inc, inc); }
+	if(depth > 0) { fprintf(toE, " depth %d", depth); DPRINT(" depth %d", depth); }
+        if(suffix) { fprintf(toE, suffix, inc); DPRINT(suffix, inc); }
 	fprintf(toE, "%s\n", ponder);
-	printf("%s\n", ponder);
+	DPRINT("%s\n", ponder);
 }
 
 void
@@ -106,7 +106,7 @@ LoadPos(int moveNr)
 	int j;
 	fprintf(toE, "%s moves", iniPos);
 	DPRINT(    "# %s moves", iniPos);
-	for(j=0; j<moveNr; j++) fprintf(toE, " %s", move[j]),printf(" %s", move[j]);
+	for(j=0; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }
 }
 
 char *Convert(char *pv)
@@ -128,13 +128,13 @@ Engine2GUI()
     char line[1024], command[256];
 
     while(1) {
-	int i=0, x; char *p;
+	int i=0, x; char *p, dummy;
 
 	fflush(stdout); fflush(toE);
 	while((line[i] = x = fgetc(fromE)) != EOF && line[i] != '\n') i++;
 	line[++i] = 0;
 	if(x == EOF) exit(0);
-	DPRINT("# engine said: %s", line); fflush(stdout);
+	DPRINT("# engine said: %s", line), fflush(stdout);
 	sscanf(line, "%s", command);
 	if(!strcmp(command, "bestmove")) {
 	    if(pause) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
@@ -179,7 +179,7 @@ Engine2GUI()
 	    int d=0, s=0, t=0, n=0;
 	    char *pv;
 	    if(!post) continue;
-	    if(strstr(line, "info string ") == line) printf("%d 0 0 0 %s", lastDepth, line+12); else {
+	    if(sscanf(line+5, "string %c", &dummy) == 1) printf("%d 0 0 0 %s", lastDepth, line+12); else {
 		if(p = strstr(line+4, " depth "))      sscanf(p+7, "%d", &d), statDepth = d;
 		if(p = strstr(line+4, " score cp "))   sscanf(p+10, "%d", &s), statScore = s; else
 		if(p = strstr(line+4, " score mate ")) sscanf(p+12, "%d", &s), s += s>0 ? 100000 : -100000, statScore = s; else
-- 
1.7.0.4