X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=5e346e5855e2d6ee197369487cd86934c150d1de;hb=259aca883470b6cd7fc47e417475f05120400d3c;hp=8d6a27398602c7c2e463fda24817384edf8d336a;hpb=d57f0dc382fe3f882d91d98a41756dfdda25ec7d;p=xboard.git

diff --git a/backend.c b/backend.c
index 8d6a273..5e346e5 100644
--- a/backend.c
+++ b/backend.c
@@ -147,12 +147,6 @@ extern int gettimeofday(struct timeval *, struct timezone *);
 #endif
 
 
-/* A point in time */
-typedef struct {
-    long sec;  /* Assuming this is >= 32 bits */
-    int ms;    /* Assuming this is >= 16 bits */
-} TimeMark;
-
 int establish P((void));
 void read_from_player P((InputSourceRef isr, VOIDSTAR closure,
 			 char *buf, int count, int error));
@@ -210,8 +204,6 @@ void CopyPlayerNameIntoFileName P((char **, char *));
 char *SavePart P((char *));
 int SaveGameOldStyle P((FILE *));
 int SaveGamePGN P((FILE *));
-void GetTimeMark P((TimeMark *));
-long SubtractTimeMarks P((TimeMark *, TimeMark *));
 int CheckFlags P((void));
 long NextTickLength P((long));
 void CheckTimeControl P((void));
@@ -823,7 +815,7 @@ InitEngine(ChessProgramState *cps, int n)
 
 	len = snprintf(buf, MSG_SIZ, _("protocol version %d not supported"),
 		       appData.protocolVersion[n]);
-	if( (len > MSG_SIZ) && appData.debugMode )
+	if( (len >= MSG_SIZ) && appData.debugMode )
 	  fprintf(debugFP, "InitBackEnd1: buffer truncated.\n");
 
 	DisplayFatalError(buf, 0, 2);
@@ -1070,7 +1062,7 @@ InitBackEnd1()
       case VariantKriegspiel:   /* need to hide pieces and move details */
 	/* case VariantFischeRandom: (Fabien: moved below) */
 	len = snprintf(buf,MSG_SIZ, _("Variant %s supported only in ICS mode"), appData.variant);
-	if( (len > MSG_SIZ) && appData.debugMode )
+	if( (len >= MSG_SIZ) && appData.debugMode )
 	  fprintf(debugFP, "InitBackEnd1: buffer truncated.\n");
 
 	DisplayFatalError(buf, 0, 2);
@@ -1088,7 +1080,7 @@ InitBackEnd1()
       case Variant36:
       default:
 	len = snprintf(buf, MSG_SIZ, _("Unknown variant name %s"), appData.variant);
-	if( (len > MSG_SIZ) && appData.debugMode )
+	if( (len >= MSG_SIZ) && appData.debugMode )
 	  fprintf(debugFP, "InitBackEnd1: buffer truncated.\n");
 
 	DisplayFatalError(buf, 0, 2);
@@ -1493,7 +1485,7 @@ InitBackEnd3 P((void))
 	      len = snprintf(buf, MSG_SIZ, _("Could not connect to host %s, port %s"),
 			appData.icsHost, appData.icsPort);
 
-	    if( (len > MSG_SIZ) && appData.debugMode )
+	    if( (len >= MSG_SIZ) && appData.debugMode )
 	      fprintf(debugFP, "InitBackEnd3: buffer truncated.\n");
 
 	    DisplayFatalError(buf, err, 1);
@@ -1547,7 +1539,7 @@ InitBackEnd3 P((void))
       initialMode = Training;
     } else {
       len = snprintf(buf, MSG_SIZ, _("Unknown initialMode %s"), appData.initialMode);
-      if( (len > MSG_SIZ) && appData.debugMode )
+      if( (len >= MSG_SIZ) && appData.debugMode )
 	fprintf(debugFP, "InitBackEnd3: buffer truncated.\n");
 
       DisplayFatalError(buf, 0, 2);
@@ -2146,7 +2138,7 @@ StringToVariant(e)
 	  break;
 	default:
 	  len = snprintf(buf, MSG_SIZ, _("Unknown wild type %d"), wnum);
-	  if( (len > MSG_SIZ) && appData.debugMode )
+	  if( (len >= MSG_SIZ) && appData.debugMode )
 	    fprintf(debugFP, "StringToVariant: buffer truncated.\n");
 
 	  DisplayError(buf, 0);
@@ -3636,7 +3628,7 @@ read_from_ics(isr, closure, data, count, error)
 			flipView = appData.flipView;
 			DrawPosition(TRUE, boards[currentMove]);
 			DisplayBothClocks();
-			snprintf(str, MSG_SIZ, "%s vs. %s",
+			snprintf(str, MSG_SIZ, _("%s vs. %s"),
 				gameInfo.white, gameInfo.black);
 			DisplayTitle(str);
 			gameMode = IcsIdle;
@@ -4051,10 +4043,10 @@ read_from_ics(isr, closure, data, count, error)
 			    char wh[16], bh[16];
 			    PackHolding(wh, white_holding);
 			    PackHolding(bh, black_holding);
-			    snprintf(str, MSG_SIZ,"[%s-%s] %s-%s", wh, bh,
+			    snprintf(str, MSG_SIZ, "[%s-%s] %s-%s", wh, bh,
 				    gameInfo.white, gameInfo.black);
 			} else {
-			  snprintf(str, MSG_SIZ, "%s [%s] vs. %s [%s]",
+			  snprintf(str, MSG_SIZ, _("%s [%s] vs. %s [%s]"),
 				    gameInfo.white, white_holding,
 				    gameInfo.black, black_holding);
 			}
@@ -4778,11 +4770,11 @@ ParseBoard12(string)
 		    basetime, increment, (int) gameInfo.variant);
 	} else {
 	    if(gameInfo.variant == VariantNormal)
-	      snprintf(str, MSG_SIZ, "%s (%d) vs. %s (%d) {%d %d}",
+	      snprintf(str, MSG_SIZ, _("%s (%d) vs. %s (%d) {%d %d}"),
 		    gameInfo.white, white_stren, gameInfo.black, black_stren,
 		    basetime, increment);
 	    else
-	      snprintf(str, MSG_SIZ, "%s (%d) vs. %s (%d) {%d %d %s}",
+	      snprintf(str, MSG_SIZ, _("%s (%d) vs. %s (%d) {%d %d %s}"),
 		    gameInfo.white, white_stren, gameInfo.black, black_stren,
 		    basetime, increment, VariantName(gameInfo.variant));
 	}
@@ -5031,8 +5023,8 @@ UploadGameEvent()
     int i, last = forwardMostMove; // make sure ICS reply cannot pre-empt us by clearing fmm
     static char *castlingStrings[4] = { "none", "kside", "qside", "both" };
     if(gameMode == IcsObserving || gameMode == IcsPlayingBlack || gameMode == IcsPlayingWhite) {
-	DisplayError("You cannot do this while you are playing or observing", 0);
-	return;
+      DisplayError(_("You cannot do this while you are playing or observing"), 0);
+      return;
     }
     if(gameMode != IcsExamining) { // is this ever not the case?
 	char buf[MSG_SIZ], *p, *fen, command[MSG_SIZ], bsetup = 0;
@@ -6664,7 +6656,7 @@ FinishMove(moveType, fromX, fromY, toX, toY, promoChar)
       gameMode = MachinePlaysBlack;
       StartClocks();
       SetGameInfo();
-      snprintf(buf, MSG_SIZ, "%s vs. %s", gameInfo.white, gameInfo.black);
+      snprintf(buf, MSG_SIZ, _("%s vs. %s"), gameInfo.white, gameInfo.black);
       DisplayTitle(buf);
       if (first.sendName) {
 	snprintf(buf, MSG_SIZ,"name %s\n", gameInfo.white);
@@ -8664,7 +8656,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 			if(f = fopen(buf, "w")) { // export PV to applicable PV file
 				fprintf(f, "%5.2f/%-2d %s", curscore/100., plylev, pv);
 				fclose(f);
-			} else DisplayError("failed writing PV", 0);
+			} else DisplayError(_("failed writing PV"), 0);
 		}
 
 		tempStats.depth = plylev;
@@ -10481,6 +10473,7 @@ GameEnds(result, resultDetails, whosays)
 		     first.matchWins, second.matchWins,
 		     appData.matchGames - (first.matchWins + second.matchWins));
 	    if(!appData.tourneyFile[0]) matchGame++, DisplayTwoMachinesTitle(); // [HGM] update result in window title
+	    if(strcmp(ranking, "busy") && appData.afterTourney && appData.afterTourney[0]) RunCommand(appData.afterTourney);
 	    popupRequested++; // [HGM] crash: postpone to after resetting endingGame
 	    if (appData.firstPlaysBlack) { // [HGM] match: back to original for next match
 		first.twoMachinesColor = "black\n";
@@ -11579,7 +11572,7 @@ LoadGame(f, gameNumber, title, useList)
     yynewfile(f);
 
     if (lg && lg->gameInfo.white && lg->gameInfo.black) {
-      snprintf(buf, sizeof(buf), "%s vs. %s", lg->gameInfo.white,
+      snprintf(buf, sizeof(buf), _("%s vs. %s"), lg->gameInfo.white,
 		lg->gameInfo.black);
 	    DisplayTitle(buf);
     } else if (*title != NULLCHAR) {
@@ -12207,7 +12200,7 @@ SaveGameToFile(filename, append)
 	    DisplayMessage(_("Waiting for access to save file"), "");
 	    flock(fileno(f), LOCK_EX); // [HGM] lock: lock file while we are writing
 	    DisplayMessage(_("Saving game"), "");
-	    if(lseek(fileno(f), 0, SEEK_END) == -1) DisplayError("Bad Seek", errno);     // better safe than sorry...
+	    if(lseek(fileno(f), 0, SEEK_END) == -1) DisplayError(_("Bad Seek"), errno);     // better safe than sorry...
 	    result = SaveGame(f, 0, NULL);
 	    DisplayMessage(buf, "");
 	    return result;
@@ -13194,7 +13187,7 @@ MachineWhiteEvent()
     pausing = FALSE;
     ModeHighlight();
     SetGameInfo();
-    snprintf(buf, MSG_SIZ, "%s vs. %s", gameInfo.white, gameInfo.black);
+    snprintf(buf, MSG_SIZ, _("%s vs. %s"), gameInfo.white, gameInfo.black);
     DisplayTitle(buf);
     if (first.sendName) {
       snprintf(buf, MSG_SIZ, "name %s\n", gameInfo.black);
@@ -13271,7 +13264,7 @@ MachineBlackEvent()
     pausing = FALSE;
     ModeHighlight();
     SetGameInfo();
-    snprintf(buf, MSG_SIZ, "%s vs. %s", gameInfo.white, gameInfo.black);
+    snprintf(buf, MSG_SIZ, _("%s vs. %s"), gameInfo.white, gameInfo.black);
     DisplayTitle(buf);
     if (first.sendName) {
       snprintf(buf, MSG_SIZ, "name %s\n", gameInfo.white);
@@ -13316,24 +13309,24 @@ DisplayTwoMachinesTitle()
     char buf[MSG_SIZ];
     if (appData.matchGames > 0) {
         if(appData.tourneyFile[0]) {
-	  snprintf(buf, MSG_SIZ, "%s vs. %s (%d/%d%s)",
+	  snprintf(buf, MSG_SIZ, _("%s vs. %s (%d/%d%s)"),
 		   gameInfo.white, gameInfo.black,
 		   nextGame+1, appData.matchGames+1,
 		   appData.tourneyType>0 ? "gt" : appData.tourneyType<0 ? "sw" : "rr");
         } else 
         if (first.twoMachinesColor[0] == 'w') {
-	  snprintf(buf, MSG_SIZ, "%s vs. %s (%d-%d-%d)",
+	  snprintf(buf, MSG_SIZ, _("%s vs. %s (%d-%d-%d)"),
 		   gameInfo.white, gameInfo.black,
 		   first.matchWins, second.matchWins,
 		   matchGame - 1 - (first.matchWins + second.matchWins));
 	} else {
-	  snprintf(buf, MSG_SIZ, "%s vs. %s (%d-%d-%d)",
+	  snprintf(buf, MSG_SIZ, _("%s vs. %s (%d-%d-%d)"),
 		   gameInfo.white, gameInfo.black,
 		   second.matchWins, first.matchWins,
 		   matchGame - 1 - (first.matchWins + second.matchWins));
 	}
     } else {
-      snprintf(buf, MSG_SIZ, "%s vs. %s", gameInfo.white, gameInfo.black);
+      snprintf(buf, MSG_SIZ, _("%s vs. %s"), gameInfo.white, gameInfo.black);
     }
     DisplayTitle(buf);
 }