X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=args.h;h=60a04a5c19aaf697a20bbccbe73d27b5b6101d0e;hb=a31d0897123ab90c8d4a8304619834079c3ad5a9;hp=d3909b5baaf7f29da156798ac6efc35a0ff0fa90;hpb=d28cb216c29eefc33a9ebce0a498bcf406b9775f;p=xboard.git

diff --git a/args.h b/args.h
index d3909b5..60a04a5 100644
--- a/args.h
+++ b/args.h
@@ -741,7 +741,7 @@ ArgDescriptor argDescriptorIndirection =
 { "", ArgSettingsFilename, (void *) NULL, FALSE };
 
 void
-ExitArgError(char *msg, char *badArg)
+ExitArgError(char *msg, char *badArg, Boolean quit)
 {
   char buf[MSG_SIZ];
   int len;
@@ -750,6 +750,7 @@ ExitArgError(char *msg, char *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);
 }
@@ -759,7 +760,7 @@ ValidateInt(char *s)
 {
   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);
 }
 
@@ -849,9 +850,11 @@ ParseArgs(GetFunc get, void *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;
@@ -877,7 +880,7 @@ ParseArgs(GetFunc get, void *cl)
 
     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 == '{') {
@@ -937,7 +940,7 @@ ParseArgs(GetFunc get, void *cl)
 	  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';
@@ -1021,7 +1024,7 @@ ParseArgs(GetFunc get, void *cl)
 	} else {
 	  if (ad->argLoc != NULL) {
 	  } else {
-	    ExitArgError("Failed to open indirection file", argValue);
+	    ExitArgError("Failed to open indirection file", argValue, TRUE);
 	  }
 	}
       }
@@ -1038,7 +1041,7 @@ ParseArgs(GetFunc get, void *cl)
 	*(Boolean *) ad->argLoc = FALSE;
 	break;
       default:
-	ExitArgError("Unrecognized boolean argument value", argValue);
+	ExitArgError("Unrecognized boolean argument value", argValue, TRUE);
 	break;
       }
       break;
@@ -1066,7 +1069,7 @@ ParseArgs(GetFunc get, void *cl)
       break;
 
     case ArgNone:
-      ExitArgError("Unrecognized argument", argValue);
+      ExitArgError("Unrecognized argument", argValue, TRUE);
       break;
     case ArgTwo:
     case ArgTrue: