* args.c -- Option parsing and saving for X and Windows versions of XBoard
*
* Copyright 1991 by Digital Equipment Corporation, Maynard,
- * Massachusetts.
+ * Massachusetts.
*
* Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
*
* Enhancements Copyright 2005 Alessandro Scotti
*
* along with this program. If not, see http://www.gnu.org/licenses/. *
*
*------------------------------------------------------------------------
- ** See the file ChangeLog for a revision history.
+ ** See the file ChangeLog for a revision history.
*/
// Note: this file is not a normal header, but contains executable code
// for #inclusion in winboard.c and xboard.c, rather than separate compilation,
-// so that it can make use of the proper context of #defined symbols and
+// so that it can make use of the proper context of #defined symbols and
// declarations in those files.
typedef enum {
- ArgString, ArgInt, ArgFloat, ArgBoolean, ArgTrue, ArgFalse, ArgNone,
+ ArgString, ArgInt, ArgFloat, ArgBoolean, ArgTrue, ArgFalse, ArgNone,
ArgColor, ArgAttribs, ArgFilename, ArgBoardSize, ArgFont, ArgCommSettings,
- ArgSettingsFilename,
+ ArgSettingsFilename, ArgTwo,
ArgX, ArgY, ArgZ // [HGM] placement: for window-placement options stored relative to main window
} ArgType;
IcsTextMenuEntry icsTextMenuEntry[ICS_TEXT_MENU_SIZE];
int junk;
+Boolean singleList;
+char *homeDir;
void EnsureOnScreen(int *x, int *y, int minX, int minY);
char StringGet(void *getClosure);
void ParseArgs(GetFunc get, void *cl);
// [HGM] this is an exact duplicate of something in winboard.c. Move to backend.c?
-char *defaultTextAttribs[] =
+char *defaultTextAttribs[] =
{
COLOR_SHOUT, COLOR_SSHOUT, COLOR_CHANNEL1, COLOR_CHANNEL, COLOR_KIBITZ,
COLOR_TELL, COLOR_CHALLENGE, COLOR_REQUEST, COLOR_SEEK, COLOR_NORMAL,
{ "phc", ArgColor, (void *) 5, FALSE, INVALID },
{ "movesPerSession", ArgInt, (void *) &appData.movesPerSession, TRUE, (ArgIniType) MOVES_PER_SESSION },
{ "mps", ArgInt, (void *) &appData.movesPerSession, FALSE, INVALID },
- { "initString", ArgString, (void *) &appData.initString, FALSE, INVALID },
- { "firstInitString", ArgString, (void *) &appData.initString, FALSE, (ArgIniType) INIT_STRING },
+ { "initString", ArgString, (void *) &appData.firstInitString, FALSE, INVALID },
+ { "firstInitString", ArgString, (void *) &appData.firstInitString, FALSE, (ArgIniType) INIT_STRING },
{ "secondInitString", ArgString, (void *) &appData.secondInitString, FALSE, (ArgIniType) INIT_STRING },
{ "firstComputerString", ArgString, (void *) &appData.firstComputerString,
FALSE, (ArgIniType) COMPUTER_STRING },
{ "fd", ArgFilename, (void *) &appData.firstDirectory, FALSE, INVALID },
{ "secondDirectory", ArgFilename, (void *) &appData.secondDirectory, FALSE, (ArgIniType) SECOND_DIRECTORY },
{ "sd", ArgFilename, (void *) &appData.secondDirectory, FALSE, INVALID },
+ { "variations", ArgBoolean, (void *) &appData.variations, TRUE, (ArgIniType) FALSE },
/* some options only used by the XBoard front end, and ignored in WinBoard */
/* Their saving is controlled by XBOARD, which in WinBoard is defined as FALSE */
{ "pixmap", ArgFilename, (void *) &appData.pixmapDirectory, FALSE, INVALID },
{ "bitmapDirectory", ArgFilename, (void *) &appData.bitmapDirectory, XBOARD, (ArgIniType) "" },
{ "bm", ArgFilename, (void *) &appData.bitmapDirectory, FALSE, INVALID },
+ { "soundDirectory", ArgFilename, (void *) &appData.soundDirectory, XBOARD, (ArgIniType) "" },
{ "msLoginDelay", ArgInt, (void *) &appData.msLoginDelay, XBOARD, (ArgIniType) MS_LOGIN_DELAY },
{ "pasteSelection", ArgBoolean, (void *) &appData.pasteSelection, XBOARD, (ArgIniType) FALSE },
{ "dropMenu", ArgBoolean, (void *) &appData.dropMenu, TRUE, (ArgIniType) FALSE },
+ { "pieceMenu", ArgBoolean, (void *) &appData.pieceMenu, TRUE, (ArgIniType) TRUE },
+ { "sweepPromotions", ArgBoolean, (void *) &appData.sweepSelect, TRUE, (ArgIniType) FALSE },
{ "remoteShell", ArgFilename, (void *) &appData.remoteShell, FALSE, (ArgIniType) REMOTE_SHELL },
{ "rsh", ArgFilename, (void *) &appData.remoteShell, FALSE, INVALID },
- { "remoteUser", ArgString, (void *) &appData.remoteUser, FALSE, INVALID },
+ { "remoteUser", ArgString, (void *) &appData.remoteUser, FALSE, (ArgIniType) "" },
{ "ruser", ArgString, (void *) &appData.remoteUser, FALSE, INVALID },
{ "timeDelay", ArgFloat, (void *) &appData.timeDelay, TRUE, INVALID },
{ "td", ArgFloat, (void *) &appData.timeDelay, FALSE, INVALID },
{ "timeControl", ArgString, (void *) &appData.timeControl, TRUE, (ArgIniType) TIME_CONTROL },
{ "tc", ArgString, (void *) &appData.timeControl, FALSE, INVALID },
- { "timeIncrement", ArgInt, (void *) &appData.timeIncrement, TRUE, (ArgIniType) TIME_INCREMENT },
- { "inc", ArgInt, (void *) &appData.timeIncrement, FALSE, INVALID },
+ { "timeIncrement", ArgFloat, (void *) &appData.timeIncrement, TRUE, INVALID },
+ { "inc", ArgFloat, (void *) &appData.timeIncrement, FALSE, INVALID },
{ "internetChessServerMode", ArgBoolean, (void *) &appData.icsActive, FALSE, INVALID },
{ "ics", ArgTrue, (void *) &appData.icsActive, FALSE, (ArgIniType) FALSE },
{ "xics", ArgFalse, (void *) &appData.icsActive, FALSE, INVALID },
{ "xtelnet", ArgFalse, (void *) &appData.useTelnet, FALSE, INVALID },
{ "-telnet", ArgFalse, (void *) &appData.useTelnet, FALSE, INVALID },
{ "telnetProgram", ArgFilename, (void *) &appData.telnetProgram, FALSE, (ArgIniType) TELNET_PROGRAM },
- { "internetChessserverHelper", ArgFilename, (void *) &appData.icsHelper,
+ { "internetChessserverHelper", ArgFilename, (void *) &appData.icsHelper,
FALSE, INVALID }, // for XB
{ "icshelper", ArgFilename, (void *) &appData.icsHelper, FALSE, (ArgIniType) "" },
{ "seekGraph", ArgBoolean, (void *) &appData.seekGraph, TRUE, (ArgIniType) FALSE },
{ "popup", ArgTrue, (void *) &appData.popupMoveErrors, FALSE, INVALID },
{ "xpopup", ArgFalse, (void *) &appData.popupMoveErrors, FALSE, INVALID },
{ "-popup", ArgFalse, (void *) &appData.popupMoveErrors, FALSE, INVALID },
- { "popUpErrors", ArgBoolean, (void *) &appData.popupMoveErrors,
+ { "popUpErrors", ArgBoolean, (void *) &appData.popupMoveErrors,
FALSE, INVALID }, /* only so that old WinBoard.ini files from betas can be read */
{ "clockFont", ArgFont, (void *) CLOCK_FONT, TRUE, INVALID },
- { "messageFont", ArgFont, (void *) MESSAGE_FONT, !XBOARD, INVALID },
- { "font", ArgFont, (void *) MESSAGE_FONT, XBOARD, INVALID },
+ { "messageFont", ArgFont, (void *) MESSAGE_FONT, TRUE, INVALID },
+ { "font", ArgFont, (void *) MESSAGE_FONT, FALSE, INVALID }, /* only so that old .xboardrc files will parse. -font does not work from the command line because it is captured by the X libraries. */
{ "coordFont", ArgFont, (void *) COORD_FONT, TRUE, INVALID },
{ "tagsFont", ArgFont, (void *) EDITTAGS_FONT, TRUE, INVALID },
{ "commentFont", ArgFont, (void *) COMMENT_FONT, TRUE, INVALID },
{ "icsFont", ArgFont, (void *) CONSOLE_FONT, TRUE, INVALID },
{ "moveHistoryFont", ArgFont, (void *) MOVEHISTORY_FONT, TRUE, INVALID }, /* [AS] */
+ { "gameListFont", ArgFont, (void *) GAMELIST_FONT, TRUE, INVALID }, /* [HGM] */
{ "boardSize", ArgBoardSize, (void *) &boardSize,
TRUE, (ArgIniType) -1 }, /* must come after all fonts */
{ "size", ArgBoardSize, (void *) &boardSize, FALSE, INVALID },
{ "soundIcsDraw", ArgFilename, (void *) &appData.soundIcsDraw, TRUE, (ArgIniType) "" },
{ "soundIcsUnfinished", ArgFilename, (void *) &appData.soundIcsUnfinished, TRUE, (ArgIniType) "" },
{ "soundIcsAlarm", ArgFilename, (void *) &appData.soundIcsAlarm, TRUE, (ArgIniType) "" },
+ { "disguisePromotedPieces", ArgBoolean, (void *) &appData.disguise, TRUE, (ArgIniType) TRUE },
{ "reuseFirst", ArgBoolean, (void *) &appData.reuseFirst, FALSE, (ArgIniType) TRUE },
{ "reuse", ArgTrue, (void *) &appData.reuseFirst, FALSE, INVALID },
{ "xreuse", ArgFalse, (void *) &appData.reuseFirst, FALSE, INVALID },
{ "comPortSettings", ArgCommSettings, (void *) /*&dcb*/ 0, TRUE, INVALID },
{ "settingsFile", ArgSettingsFilename, (void *) &settingsFileName, FALSE, (ArgIniType) SETTINGS_FILE },
{ "ini", ArgSettingsFilename, (void *) &settingsFileName, FALSE, INVALID },
+ { "at", ArgSettingsFilename, (void *) NULL, FALSE, INVALID },
+ { "opt", ArgSettingsFilename, (void *) NULL, FALSE, INVALID },
{ "saveSettingsFile", ArgFilename, (void *) &settingsFileName, FALSE, INVALID },
{ "saveSettingsOnExit", ArgBoolean, (void *) &saveSettingsOnExit, TRUE, (ArgIniType) TRUE },
{ "chessProgram", ArgBoolean, (void *) &chessProgram, FALSE, (ArgIniType) FALSE },
{ "-cp", ArgFalse, (void *) &chessProgram, FALSE, INVALID },
{ "icsMenu", ArgString, (void *) &icsTextMenuString, TRUE, (ArgIniType) ICS_TEXT_MENU_DEFAULT },
{ "icsNames", ArgString, (void *) &icsNames, TRUE, (ArgIniType) ICS_NAMES },
+ { "singleEngineList", ArgBoolean, (void *) &singleList, !XBOARD, (ArgIniType) FALSE },
{ "firstChessProgramNames", ArgString, (void *) &firstChessProgramNames,
TRUE, (ArgIniType) FCP_NAMES },
{ "secondChessProgramNames", ArgString, (void *) &secondChessProgramNames,
- TRUE, (ArgIniType) SCP_NAMES },
+ !XBOARD, (ArgIniType) SCP_NAMES },
{ "initialMode", ArgString, (void *) &appData.initialMode, FALSE, (ArgIniType) "" },
{ "mode", ArgString, (void *) &appData.initialMode, FALSE, INVALID },
{ "variant", ArgString, (void *) &appData.variant, FALSE, (ArgIniType) "normal" },
{ "firstUCI", ArgTrue, (void *) &appData.firstIsUCI, FALSE, INVALID },
{ "secondIsUCI", ArgBoolean, (void *) &appData.secondIsUCI, FALSE, (ArgIniType) FALSE },
{ "sUCI", ArgTrue, (void *) &appData.secondIsUCI, FALSE, INVALID },
+ { "fUCCI", ArgTwo, (void *) &appData.firstIsUCI, FALSE, INVALID },
+ { "sUCCI", ArgTwo, (void *) &appData.secondIsUCI, FALSE, INVALID },
+ { "fUSI", ArgTwo, (void *) &appData.firstIsUCI, FALSE, INVALID },
+ { "sUSI", ArgTwo, (void *) &appData.secondIsUCI, FALSE, INVALID },
{ "secondUCI", ArgTrue, (void *) &appData.secondIsUCI, FALSE, INVALID },
{ "firstHasOwnBookUCI", ArgBoolean, (void *) &appData.firstHasOwnBookUCI, FALSE, (ArgIniType) TRUE },
{ "fNoOwnBookUCI", ArgFalse, (void *) &appData.firstHasOwnBookUCI, FALSE, INVALID },
{ "sNoOwnBookUCI", ArgFalse, (void *) &appData.secondHasOwnBookUCI, FALSE, INVALID },
{ "secondXBook", ArgFalse, (void *) &appData.secondHasOwnBookUCI, FALSE, INVALID },
{ "adapterCommand", ArgFilename, (void *) &appData.adapterCommand, TRUE, (ArgIniType) "polyglot -noini -ec \"%fcp\" -ed \"%fd\"" },
+ { "uxiAdapter", ArgFilename, (void *) &appData.ucciAdapter, TRUE, (ArgIniType) "" },
{ "polyglotDir", ArgFilename, (void *) &appData.polyglotDir, TRUE, (ArgIniType) "" },
{ "usePolyglotBook", ArgBoolean, (void *) &appData.usePolyglotBook, TRUE, (ArgIniType) FALSE },
{ "polyglotBook", ArgFilename, (void *) &appData.polyglotBook, TRUE, (ArgIniType) "" },
- { "bookDepth", ArgInt, (void *) &appData.bookDepth, TRUE, (ArgIniType) 12 },
- { "bookVariation", ArgInt, (void *) &appData.bookStrength, TRUE, (ArgIniType) 50 },
- { "defaultHashSize", ArgInt, (void *) &appData.defaultHashSize, TRUE, (ArgIniType) 64 },
+ { "bookDepth", ArgInt, (void *) &appData.bookDepth, TRUE, (ArgIniType) 12 },
+ { "bookVariation", ArgInt, (void *) &appData.bookStrength, TRUE, (ArgIniType) 50 },
+ { "discourageOwnBooks", ArgBoolean, (void *) &appData.defNoBook, TRUE, (ArgIniType) FALSE },
+ { "defaultHashSize", ArgInt, (void *) &appData.defaultHashSize, TRUE, (ArgIniType) 64 },
{ "defaultCacheSizeEGTB", ArgInt, (void *) &appData.defaultCacheSizeEGTB, TRUE, (ArgIniType) 4 },
{ "defaultPathEGTB", ArgFilename, (void *) &appData.defaultPathEGTB, TRUE, (ArgIniType) "c:\\egtb" },
+ { "language", ArgFilename, (void *) &appData.language, TRUE, (ArgIniType) "" },
+ { "userFileDirectory", ArgFilename, (void *) &homeDir, FALSE, (ArgIniType) installDir },
+ { "usePieceFont", ArgBoolean, (void *) &appData.useFont, TRUE, (ArgIniType) FALSE },
+ { "useBoardTexture", ArgBoolean, (void *) &appData.useBitmaps, TRUE, (ArgIniType) FALSE },
+
+ // [HGM] tournament options
+ { "tourneyFile", ArgFilename, (void *) &appData.tourneyFile, FALSE, (ArgIniType) "" },
+ { "tf", ArgFilename, (void *) &appData.tourneyFile, FALSE, INVALID },
+ { "participants", ArgString, (void *) &appData.participants, FALSE, (ArgIniType) "" },
+ { "tourneyType", ArgInt, (void *) &appData.tourneyType, FALSE, (ArgIniType) 0 },
+ { "tt", ArgInt, (void *) &appData.tourneyType, FALSE, INVALID },
+ { "tourneyCycles", ArgInt, (void *) &appData.tourneyCycles, FALSE, (ArgIniType) 1 },
+ { "cy", ArgInt, (void *) &appData.tourneyCycles, FALSE, INVALID },
+ { "results", ArgString, (void *) &appData.results, FALSE, (ArgIniType) "" },
+ { "syncAfterRound", ArgBoolean, (void *) &appData.roundSync, FALSE, (ArgIniType) FALSE },
+ { "syncAfterCycle", ArgBoolean, (void *) &appData.cycleSync, FALSE, (ArgIniType) TRUE },
+ { "seedBase", ArgInt, (void *) &appData.seedBase, FALSE, (ArgIniType) 1 },
+ { "afterGame", ArgString, (void *) &appData.afterGame, FALSE, INVALID },
/* [HGM] board-size, adjudication and misc. options */
{ "oneClickMove", ArgBoolean, (void *) &appData.oneClick, TRUE, (ArgIniType) FALSE },
- { "boardWidth", ArgInt, (void *) &appData.NrFiles, TRUE, (ArgIniType) -1 },
- { "boardHeight", ArgInt, (void *) &appData.NrRanks, TRUE, (ArgIniType) -1 },
- { "holdingsSize", ArgInt, (void *) &appData.holdingsSize, TRUE, (ArgIniType) -1 },
+ { "boardWidth", ArgInt, (void *) &appData.NrFiles, FALSE, (ArgIniType) -1 },
+ { "boardHeight", ArgInt, (void *) &appData.NrRanks, FALSE, (ArgIniType) -1 },
+ { "holdingsSize", ArgInt, (void *) &appData.holdingsSize, FALSE, (ArgIniType) -1 },
{ "defaultMatchGames", ArgInt, (void *) &appData.defaultMatchGames, TRUE, (ArgIniType) 10 },
{ "matchPause", ArgInt, (void *) &appData.matchPause, TRUE, (ArgIniType) 10000 },
{ "pieceToCharTable", ArgString, (void *) &appData.pieceToCharTable, FALSE, INVALID },
{ "pieceNickNames", ArgString, (void *) &appData.pieceNickNames, FALSE, INVALID },
{ "colorNickNames", ArgString, (void *) &appData.colorNickNames, FALSE, INVALID },
- { "flipBlack", ArgBoolean, (void *) &appData.upsideDown, TRUE, (ArgIniType) FALSE },
- { "allWhite", ArgBoolean, (void *) &appData.allWhite, TRUE, (ArgIniType) FALSE },
+ { "flipBlack", ArgBoolean, (void *) &appData.upsideDown, FALSE, (ArgIniType) FALSE },
+ { "allWhite", ArgBoolean, (void *) &appData.allWhite, FALSE, (ArgIniType) FALSE },
{ "alphaRank", ArgBoolean, (void *) &appData.alphaRank, FALSE, (ArgIniType) FALSE },
{ "firstAlphaRank", ArgBoolean, (void *) &first.alphaRank, FALSE, (ArgIniType) FALSE },
{ "secondAlphaRank", ArgBoolean, (void *) &second.alphaRank, FALSE, (ArgIniType) FALSE },
{ "icstype", ArgInt, (void *) &ics_type, FALSE, INVALID },
{ "forceIllegalMoves", ArgTrue, (void *) &appData.forceIllegal, FALSE, INVALID },
{ "showTargetSquares", ArgBoolean, (void *) &appData.markers, TRUE, FALSE },
+ { "firstPgnName", ArgString, (void *) &appData.pgnName[0], FALSE, (ArgIniType) "" },
+ { "fn", ArgString, (void *) &appData.pgnName[0], FALSE, INVALID },
+ { "secondPgnName", ArgString, (void *) &appData.pgnName[1], FALSE, (ArgIniType) "" },
+ { "sn", ArgString, (void *) &appData.pgnName[1], FALSE, INVALID },
+ { "absoluteAnalysisScores", ArgBoolean, (void *) &appData.whitePOV, TRUE, FALSE },
+ { "scoreWhite", ArgBoolean, (void *) &appData.scoreWhite, TRUE, FALSE },
+ { "evalZoom", ArgInt, (void *) &appData.zoom, TRUE, (ArgIniType) 1 },
+ { "evalThreshold", ArgInt, (void *) &appData.evalThreshold, TRUE, (ArgIniType) 25 },
+ { "fSAN", ArgTrue, (void *) &appData.pvSAN[0], FALSE, FALSE },
+ { "sSAN", ArgTrue, (void *) &appData.pvSAN[1], FALSE, FALSE },
+ { "pairingEngine", ArgFilename, (void *) &appData.pairingEngine, TRUE, "" },
+ { "defaultTourneyName", ArgFilename, (void *) &appData.defName, TRUE, "" },
+ { "eloThresholdAny", ArgInt, (void *) &appData.eloThreshold1, FALSE, (ArgIniType) 0 },
+ { "eloThresholdBoth", ArgInt, (void *) &appData.eloThreshold2, FALSE, (ArgIniType) 0 },
+ { "dateThreshold", ArgInt, (void *) &appData.dateThreshold, FALSE, (ArgIniType) 0 },
+ { "searchMode", ArgInt, (void *) &appData.searchMode, FALSE, (ArgIniType) 1 },
+ { "stretch", ArgInt, (void *) &appData.stretch, FALSE, (ArgIniType) 1 },
+ { "ignoreColors", ArgBoolean, (void *) &appData.ignoreColors, FALSE, FALSE },
#if ZIPPY
{ "zippyTalk", ArgBoolean, (void *) &appData.zippyTalk, FALSE, (ArgIniType) ZIPPY_TALK },
{ "", ArgSettingsFilename, (void *) NULL, FALSE };
void
-ExitArgError(char *msg, char *badArg)
+ExitArgError(char *msg, char *badArg, Boolean quit)
{
char buf[MSG_SIZ];
+ int len;
- sprintf(buf, "%s %s", msg, badArg);
+ len = snprintf(buf,MSG_SIZ, "%s %s", msg, badArg);
+ if( (len > MSG_SIZ) && appData.debugMode )
+ fprintf(debugFP, "ExitArgError: buffer truncated. Input: msg=%s badArg=%s\n", msg, badArg);
+
+ if(!quit) { printf("%s in settings file\n", buf); return; } // DisplayError does not work yet at this stage...
DisplayFatalError(buf, 0, 2);
exit(2);
}
{
char *p = s;
if(*p == '-' || *p == '+') p++;
- while(*p) if(!isdigit(*p++)) ExitArgError("Bad integer value", s);
+ while(*p) if(!isdigit(*p++)) ExitArgError("Bad integer value", s, TRUE);
return atoi(s);
}
ParseSettingsFile(char *name, char **addr)
{
FILE *f;
- int ok; char buf[MSG_SIZ], fullname[MSG_SIZ];
+ int ok,len;
+ char buf[MSG_SIZ], fullname[MSG_SIZ];
+
ok = MySearchPath(installDir, name, fullname);
- if(!ok && strchr(name, '.') == NULL) { // [HGM] append default file-name extension '.ini' when needed
- sprintf(buf, "%s.ini", name);
- ok = MySearchPath(installDir, buf, fullname);
- }
+ if(!ok && strchr(name, '.') == NULL)
+ { // append default file-name extension '.ini' when needed
+ len = snprintf(buf,MSG_SIZ, "%s.ini", name);
+ if( (len > MSG_SIZ) && appData.debugMode )
+ fprintf(debugFP, "ParseSettingsFile: buffer truncated. Input: name=%s \n",name);
+
+ ok = MySearchPath(installDir, buf, fullname);
+ }
if (ok) {
f = fopen(fullname, "r");
if (f != NULL) {
if (addr != NULL) {
- *addr = strdup(fullname);
+ ASSIGN(*addr, fullname);
}
ParseArgs(FileGet, f);
fclose(f);
ch = get(cl);
}
*q = NULLCHAR;
-
for (ad = argDescriptors; ad->argName != NULL; ad++)
if (strcmp(ad->argName, argName + 1) == 0) break;
-
- if (ad->argName == NULL)
- ExitArgError("Unrecognized argument", argName);
-
+ if (ad->argName == NULL) {
+ ExitArgError("Unrecognized argument", argName, get != &FileGet); // [HGM] make unknown argument non-fatal
+ while (ch != '\n' && ch != NULLCHAR) ch = get(cl); // but skip rest of line it is on
+ continue; // so that when it is in a settings file, it is the only setting that will be purged from it
+ }
} else if (ch == '@') {
/* Indirection file */
ad = &argDescriptorIndirection;
} else {
/* Positional argument */
ad = &argDescriptors[posarg++];
- strcpy(argName, ad->argName);
+ strncpy(argName, ad->argName,sizeof(argName)/sizeof(argName[0]));
}
+ if (ad->argType == ArgTwo) { // [HGM] kludgey arg type, not suitable for saving
+ *(Boolean *) ad->argLoc = 2;
+ continue;
+ }
if (ad->argType == ArgTrue) {
*(Boolean *) ad->argLoc = TRUE;
continue;
while (ch == ' ' || ch == '=' || ch == ':' || ch == '\t') ch = get(cl);
if (ch == NULLCHAR || ch == '\n') {
- ExitArgError("No value provided for argument", argName);
+ ExitArgError("No value provided for argument", argName, TRUE);
}
q = argValue;
if (ch == '{') {
case NULLCHAR:
start = NULLCHAR;
break;
-
+
case '}':
ch = get(cl);
start = NULLCHAR;
ch = get(cl);
break;
}
- }
+ }
} else if (ch == '\'' || ch == '"') {
// Quoting with ' ' or " ", with \ as escape character.
// Inconvenient for long strings that may contain Windows filenames.
ch = get(cl);
switch (ch) {
case NULLCHAR:
- ExitArgError("Incomplete \\ escape in value for", argName);
+ ExitArgError("Incomplete \\ escape in value for", argName, TRUE);
break;
case 'n':
*q++ = '\n';
break;
case ArgX:
- *(int *) ad->argLoc = ValidateInt(argValue) + wpMain.x; // [HGM] placement: translate stored relative to absolute
+ *(int *) ad->argLoc = ValidateInt(argValue) + wpMain.x; // [HGM] placement: translate stored relative to absolute
break;
case ArgY:
case ArgZ:
*(int *) ad->argLoc = ValidateInt(argValue);
- EnsureOnScreen(&wpMain.x, &wpMain.y, minX, minY);
+ EnsureOnScreen(&wpMain.x, &wpMain.y, minX, minY);
break;
case ArgFloat:
case ArgString:
case ArgFilename:
- *(char **) ad->argLoc = strdup(argValue);
+ ASSIGN(*(char **) ad->argLoc, argValue);
break;
case ArgSettingsFilename:
} else {
if (ad->argLoc != NULL) {
} else {
- ExitArgError("Failed to open indirection file", argValue);
+ ExitArgError("Failed to open indirection file", argValue, TRUE);
}
}
}
*(Boolean *) ad->argLoc = FALSE;
break;
default:
- ExitArgError("Unrecognized boolean argument value", argValue);
+ ExitArgError("Unrecognized boolean argument value", argValue, TRUE);
break;
}
break;
case ArgColor:
- ParseColor((int)ad->argLoc, argValue);
+ ParseColor((int)(intptr_t)ad->argLoc, argValue);
break;
case ArgAttribs: {
ParseTextAttribs(cc, argValue); // [HGM] wrapper for platform independency
}
break;
-
+
case ArgBoardSize:
ParseBoardSize(ad->argLoc, argValue);
break;
case ArgFont:
- ParseFont(argValue, (int)ad->argLoc);
+ ParseFont(argValue, (int)(intptr_t)ad->argLoc);
break;
case ArgCommSettings:
break;
case ArgNone:
- ExitArgError("Unrecognized argument", argValue);
+ ExitArgError("Unrecognized argument", argValue, TRUE);
break;
+ case ArgTwo:
case ArgTrue:
case ArgFalse: ;
}
}
void
+ParseArgsFromString(char *p)
+{
+ ParseArgs(StringGet, &p);
+}
+
+void
+ParseArgsFromFile(FILE *f)
+{
+ ParseArgs(FileGet, f);
+}
+
+void
ParseIcsTextMenu(char *icsTextMenuString)
{
// int flags = 0;
p = t + 1;
}
e++;
- }
+ }
}
void
if(argDescriptors[i].defaultValue != INVALID)
switch(argDescriptors[i].argType) {
case ArgBoolean:
+ case ArgTwo:
case ArgTrue:
case ArgFalse:
- *(Boolean *) argDescriptors[i].argLoc = (int)argDescriptors[i].defaultValue;
+ *(Boolean *) argDescriptors[i].argLoc = (int)(intptr_t)argDescriptors[i].defaultValue;
break;
case ArgInt:
case ArgX:
case ArgY:
case ArgZ:
- *(int *) argDescriptors[i].argLoc = (int)argDescriptors[i].defaultValue;
+ *(int *) argDescriptors[i].argLoc = (int)(intptr_t)argDescriptors[i].defaultValue;
break;
case ArgString:
case ArgFilename:
case ArgSettingsFilename:
- *(char **) argDescriptors[i].argLoc = (char *)argDescriptors[i].defaultValue;
+ if((char *)argDescriptors[i].defaultValue)
+ *(char **) argDescriptors[i].argLoc = strdup((char *)argDescriptors[i].defaultValue);
break;
case ArgBoardSize:
- *(int *) argDescriptors[i].argLoc = (int)argDescriptors[i].defaultValue;
+ *(int *) argDescriptors[i].argLoc = (int)(intptr_t)argDescriptors[i].defaultValue;
break;
case ArgColor:
- ParseColor((int)argDescriptors[i].argLoc, (char*)argDescriptors[i].defaultValue);
+ ParseColor((int)(intptr_t)argDescriptors[i].argLoc, (char*)argDescriptors[i].defaultValue);
break;
case ArgFloat: // floats cannot be casted to int without precision loss
default: ; // some arg types cannot be initialized through table
// float: casting to int is not harmless, so default cannot be contained in table
appData.timeDelay = TIME_DELAY;
+ appData.timeIncrement = TIME_INCREMENT;
// some complex, platform-dependent stuff that could not be handled from table
SetDefaultTextAttribs();
char *p = StrStr(appData.firstChessProgram, "WBopt");
static char *f = "first";
char buf[MSG_SIZ], *q = buf;
- if(p != NULL) { // engine command line contains WinBoard options
- sprintf(buf, p+6, f, f, f, f, f, f, f, f, f, f); // replace %s in them by "first"
+ int len;
+
+ if(p != NULL)
+ { // engine command line contains WinBoard options
+ len = snprintf(buf, MSG_SIZ, p+6, f, f, f, f, f, f, f, f, f, f); // replace %s in them by "first"
+ if( (len > MSG_SIZ) && appData.debugMode )
+ fprintf(debugFP, "InitAppData: buffer truncated.\n");
+
ParseArgs(StringGet, &q);
p[-1] = 0; // cut them offengine command line
- }
+ }
}
// now do same for second chess program
if(appData.secondChessProgram != NULL) {
char *p = StrStr(appData.secondChessProgram, "WBopt");
static char *s = "second";
char buf[MSG_SIZ], *q = buf;
- if(p != NULL) { // engine command line contains WinBoard options
- sprintf(buf, p+6, s, s, s, s, s, s, s, s, s, s); // replace %s in them by "first"
+ int len;
+
+ if(p != NULL)
+ { // engine command line contains WinBoard options
+ len = snprintf(buf,MSG_SIZ, p+6, s, s, s, s, s, s, s, s, s, s); // replace %s in them by "first"
+ if( (len > MSG_SIZ) && appData.debugMode )
+ fprintf(debugFP, "InitAppData: buffer truncated.\n");
+
ParseArgs(StringGet, &q);
p[-1] = 0; // cut them offengine command line
- }
+ }
}
/* Propagate options that affect others */
if ((!appData.noChessProgram && !chessProgram && !appData.icsActive) ||
(appData.icsActive && *appData.icsHost == NULLCHAR) ||
(chessProgram && (*appData.firstChessProgram == NULLCHAR ||
- *appData.secondChessProgram == NULLCHAR)))
+ *appData.secondChessProgram == NULLCHAR)))
PopUpStartupDialog();
/* Make sure save files land in the right (?) directory */
fprintf(f, OPTCHAR "%s" SEPCHAR "%g\n", ad->argName, *(float *)ad->argLoc);
break;
case ArgBoolean:
- fprintf(f, OPTCHAR "%s" SEPCHAR "%s\n", ad->argName,
+ fprintf(f, OPTCHAR "%s" SEPCHAR "%s\n", ad->argName,
(*(Boolean *)ad->argLoc) ? "true" : "false");
break;
case ArgTrue:
break;
case ArgCommSettings:
PrintCommPortSettings(f, ad->argName);
+ case ArgTwo:
case ArgNone:
case ArgSettingsFilename: ;
}
{ // retrieve (as text) current value of string or int argument given by name
// (this is used for maing the values available in the adapter command)
ArgDescriptor *ad;
+ int len;
for (ad = argDescriptors; ad->argName != NULL; ad++)
if (strcmp(ad->argName, name) == 0) break;
switch(ad->argType) {
case ArgString:
case ArgFilename:
- strcpy(name, *(char**) ad->argLoc);
+ strncpy(name, *(char**) ad->argLoc, MSG_SIZ);
+
return TRUE;
case ArgInt:
- sprintf(name, "%d", *(int*) ad->argLoc);
+ len = snprintf(name, MSG_SIZ, "%d", *(int*) ad->argLoc);
+ if( (len > MSG_SIZ) && appData.debugMode )
+ fprintf(debugFP, "GetArgValue: buffer truncated.\n");
+
return TRUE;
case ArgBoolean:
- sprintf(name, "%s", *(Boolean*) ad->argLoc ? "true" : "false");
+ len = snprintf(name, MSG_SIZ, "%s", *(Boolean*) ad->argLoc ? "true" : "false");
+ if( (len > MSG_SIZ) && appData.debugMode )
+ fprintf(debugFP, "GetArgValue: buffer truncated.\n");
+
return TRUE;
default: ;
}
projects / xboard.git / blobdiff