Switch to use of short menu references

[xboard.git] / pgntags.c

diff --git a/pgntags.c b/pgntags.c
index 6317c8b..23957f6 100644 (file)
--- a/pgntags.c
+++ b/pgntags.c
@@ -1,23 +1,25 @@
 /*
  * pgntags.c -- Functions to manage PGN tags
 /*
  * pgntags.c -- Functions to manage PGN tags

- * XBoard $Id: pgntags.c,v 2.1 2003/10/27 19:21:00 mann Exp $

  *
  *

- * Copyright 1995 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ *
+ * Enhancements Copyright 2005 Alessandro Scotti

  *
  * ------------------------------------------------------------------------
  *
  * ------------------------------------------------------------------------

- * This program is free software; you can redistribute it and/or modify
+ *
+ * GNU XBoard is free software: you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.

  *
  *

- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU XBoard is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.

  *
  * You should have received a copy of the GNU General Public License
  *
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+ * along with this program. If not, see http://www.gnu.org/licenses/.  *
+ *

  * ------------------------------------------------------------------------
  *
  * This file could well be a part of backend.c, but I prefer it this
  * ------------------------------------------------------------------------
  *
  * This file could well be a part of backend.c, but I prefer it this


@@ -45,15 +47,11 @@
 #include "backend.h"
 #include "parser.h"
 
 #include "backend.h"
 #include "parser.h"
 

-static char *PGNTagsStatic P((GameInfo *));
-
-

 
 /* Parse PGN tags; returns 0 for success or error number
  */
 
 /* Parse PGN tags; returns 0 for success or error number
  */

-int ParsePGNTag(tag, gameInfo)
-    char *tag;
-    GameInfo *gameInfo;
+int
+ParsePGNTag (char *tag, GameInfo *gameInfo)

 {
     char *name, *value, *p, *oldTags;
     int len;
 {
     char *name, *value, *p, *oldTags;
     int len;


@@ -105,6 +103,10 @@ int ParsePGNTag(tag, gameInfo)
        else
            gameInfo->result = GameUnfinished;
        success = TRUE;
        else
            gameInfo->result = GameUnfinished;
        success = TRUE;

+    } else if (StrCaseCmp(name, "TimeControl") == 0) {
+//     int tc, mps, inc = -1;
+//     if(sscanf(value, "%d/%d", &mps, &tc) == 2 || )
+       success = StrSavePtr(value, &gameInfo->timeControl) != NULL;

     } else if (StrCaseCmp(name, "FEN") == 0) {
        success = StrSavePtr(value, &gameInfo->fen) != NULL;
     } else if (StrCaseCmp(name, "SetUp") == 0) {
     } else if (StrCaseCmp(name, "FEN") == 0) {
        success = StrSavePtr(value, &gameInfo->fen) != NULL;
     } else if (StrCaseCmp(name, "SetUp") == 0) {


@@ -138,85 +140,84 @@ int ParsePGNTag(tag, gameInfo)
 }
 
 
 }
 
 

-
-/* Return a static buffer with a game's data.
- */
-static char *PGNTagsStatic(gameInfo)
-    GameInfo *gameInfo;
+/* Print game info */
+void
+PrintPGNTags (FILE *fp, GameInfo *gameInfo)

 {
 {

-    static char buf[8192];
-    char buf1[MSG_SIZ];
-
-    buf[0] = NULLCHAR;
-
-    sprintf(buf1, "[Event \"%s\"]\n",
-           gameInfo->event ? gameInfo->event : "?");
-    strcat(buf, buf1);
-    sprintf(buf1, "[Site \"%s\"]\n",
-           gameInfo->site ? gameInfo->site : "?");
-    strcat(buf, buf1);
-    sprintf(buf1, "[Date \"%s\"]\n",
-           gameInfo->date ? gameInfo->date : "?");
-    strcat(buf, buf1);
-    sprintf(buf1, "[Round \"%s\"]\n",
-           gameInfo->round ? gameInfo->round : "-");
-    strcat(buf, buf1);
-    sprintf(buf1, "[White \"%s\"]\n",
-           gameInfo->white ? gameInfo->white : "?");
-    strcat(buf, buf1);
-    sprintf(buf1, "[Black \"%s\"]\n",
-           gameInfo->black ? gameInfo->black : "?");
-    strcat(buf, buf1);
-    sprintf(buf1, "[Result \"%s\"]\n", PGNResult(gameInfo->result));
-    strcat(buf, buf1);
- 
-    if (gameInfo->whiteRating >= 0 ) {
-       sprintf(buf1, "[WhiteElo \"%d\"]\n", gameInfo->whiteRating );
-       strcat(buf, buf1);
-    }
-    if ( gameInfo->blackRating >= 0 ) {
-       sprintf(buf1, "[BlackElo \"%d\"]\n", gameInfo->blackRating );
-       strcat(buf, buf1);
-    }    
-    if (gameInfo->timeControl != NULL) {
-       sprintf(buf1, "[TimeControl \"%s\"]\n", gameInfo->timeControl);
-       strcat(buf, buf1);
-    }
-    if (gameInfo->variant != VariantNormal) {
-        sprintf(buf1, "[Variant \"%s\"]\n", VariantName(gameInfo->variant));
-       strcat(buf, buf1);
-    }
-    if (gameInfo->extraTags != NULL) {
-       strcat(buf, gameInfo->extraTags);
-    }
-    return buf;
+    fprintf(fp, "[Event \"%s\"]\n", gameInfo->event ? gameInfo->event : "?");
+    fprintf(fp, "[Site \"%s\"]\n", gameInfo->site ? gameInfo->site : "?");
+    fprintf(fp, "[Date \"%s\"]\n", gameInfo->date ? gameInfo->date : "?");
+    fprintf(fp, "[Round \"%s\"]\n", gameInfo->round ? gameInfo->round : "-");
+    fprintf(fp, "[White \"%s\"]\n", gameInfo->white ? gameInfo->white : "?");
+    fprintf(fp, "[Black \"%s\"]\n", gameInfo->black ? gameInfo->black : "?");
+    fprintf(fp, "[Result \"%s\"]\n", PGNResult(gameInfo->result));
+    if (gameInfo->whiteRating >= 0)
+       fprintf(fp, "[WhiteElo \"%d\"]\n", gameInfo->whiteRating);
+    if (gameInfo->blackRating >= 0)
+       fprintf(fp, "[BlackElo \"%d\"]\n", gameInfo->blackRating);
+    if (gameInfo->timeControl)
+       fprintf(fp, "[TimeControl \"%s\"]\n", gameInfo->timeControl);
+    if (gameInfo->variant != VariantNormal)
+        fprintf(fp, "[Variant \"%s\"]\n", VariantName(gameInfo->variant));
+    if (gameInfo->extraTags)
+       fputs(gameInfo->extraTags, fp);

 }
 
 
 }
 
 

- 
-/* Print game info
+/* Return a non-static buffer with a games info.

  */
  */

-void PrintPGNTags(fp, gameInfo)
-     FILE *fp;
-     GameInfo *gameInfo;
+char *
+PGNTags (GameInfo *gameInfo)

 {
 {

-    fprintf(fp, "%s", PGNTagsStatic(gameInfo));
-}
+    size_t len;
+    char *buf;
+    char *p;

 
 

+    // First calculate the needed buffer size.
+    // Then we don't have to check the buffer size later.
+    len = 12 + 11 + 11 + 12 + 12 + 12 + 25 + 1; // The first 7 tags
+    if (gameInfo->event) len += strlen(gameInfo->event);
+    if (gameInfo->site)  len += strlen(gameInfo->site);
+    if (gameInfo->date)  len += strlen(gameInfo->date);
+    if (gameInfo->round) len += strlen(gameInfo->round);
+    if (gameInfo->white) len += strlen(gameInfo->white);
+    if (gameInfo->black) len += strlen(gameInfo->black);
+    if (gameInfo->whiteRating >= 0) len += 40;
+    if (gameInfo->blackRating >= 0) len += 40;
+    if (gameInfo->timeControl) len += strlen(gameInfo->timeControl) + 20;
+    if (gameInfo->variant != VariantNormal) len += 50;
+    if (gameInfo->extraTags) len += strlen(gameInfo->extraTags);

 
 

-/* Return a non-static buffer with a games info.
- */
-char *PGNTags(gameInfo)
-    GameInfo *gameInfo;
-{
-    return StrSave(PGNTagsStatic(gameInfo));
+    buf = malloc(len);
+    if (!buf)
+       return 0;
+
+    p = buf;
+    p += sprintf(p, "[Event \"%s\"]\n", gameInfo->event ? gameInfo->event : "?");
+    p += sprintf(p, "[Site \"%s\"]\n", gameInfo->site ? gameInfo->site : "?");
+    p += sprintf(p, "[Date \"%s\"]\n", gameInfo->date ? gameInfo->date : "?");
+    p += sprintf(p, "[Round \"%s\"]\n", gameInfo->round ? gameInfo->round : "-");
+    p += sprintf(p, "[White \"%s\"]\n", gameInfo->white ? gameInfo->white : "?");
+    p += sprintf(p, "[Black \"%s\"]\n", gameInfo->black ? gameInfo->black : "?");
+    p += sprintf(p, "[Result \"%s\"]\n", PGNResult(gameInfo->result));
+    if (gameInfo->whiteRating >= 0)
+       p += sprintf(p, "[WhiteElo \"%d\"]\n", gameInfo->whiteRating);
+    if (gameInfo->blackRating >= 0)
+       p += sprintf(p, "[BlackElo \"%d\"]\n", gameInfo->blackRating);
+    if (gameInfo->timeControl)
+       p += sprintf(p, "[TimeControl \"%s\"]\n", gameInfo->timeControl);
+    if (gameInfo->variant != VariantNormal)
+        p += sprintf(p, "[Variant \"%s\"]\n", VariantName(gameInfo->variant));
+    if (gameInfo->extraTags)
+       strcpy(p, gameInfo->extraTags);
+    return buf;

 }
 
 
 /* Returns pointer to a static string with a result.
  */
 }
 
 
 /* Returns pointer to a static string with a result.
  */

-char *PGNResult(result)
-     ChessMove result;
+char *
+PGNResult (ChessMove result)

 {
     switch (result) {
       case GameUnfinished:
 {
     switch (result) {
       case GameUnfinished:


@@ -229,13 +230,11 @@ char *PGNResult(result)
       case GameIsDrawn:
        return "1/2-1/2";
     }
       case GameIsDrawn:
        return "1/2-1/2";
     }

-}  
+}

 
 /* Returns 0 for success, nonzero for error */
 int
 
 /* Returns 0 for success, nonzero for error */
 int

-ReplaceTags(tags, gameInfo)
-     char *tags;
-     GameInfo *gameInfo;
+ReplaceTags (char *tags, GameInfo *gameInfo)

 {
     ChessMove moveType;
     int err;
 {
     ChessMove moveType;
     int err;


@@ -244,13 +243,13 @@ ReplaceTags(tags, gameInfo)
     yynewstr(tags);
     for (;;) {
        yyboardindex = 0;
     yynewstr(tags);
     for (;;) {
        yyboardindex = 0;

-       moveType = (ChessMove) yylex();
+       moveType = (ChessMove) Myylex();

        if (moveType == (ChessMove) 0) {
            break;
        } else if (moveType == PGNTag) {
            err = ParsePGNTag(yy_text, gameInfo);
            if (err != 0) return err;
        if (moveType == (ChessMove) 0) {
            break;
        } else if (moveType == PGNTag) {
            err = ParsePGNTag(yy_text, gameInfo);
            if (err != 0) return err;

-       } 
+       }

     }
     /* just one problem...if there is a result in the new tags,
      * DisplayMove() won't ever show it because ClearGameInfo() set
     }
     /* just one problem...if there is a result in the new tags,
      * DisplayMove() won't ever show it because ClearGameInfo() set