X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/a6eddf542b718403c2f59203af884daad8334060..c9d2d52ac41a80b0c8acf7bcae3a7aa4c6952f4e:/conf.c

diff --git a/conf.c b/conf.c
index 39d170d..d0c3f13 100644
--- a/conf.c
+++ b/conf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conf.c,v 1.4 1999/10/15 21:12:36 mdw Exp $
+ * $Id: conf.c,v 1.7 2000/08/01 17:58:10 mdw Exp $
  *
  * Configuration parsing
  *
@@ -29,6 +29,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conf.c,v $
+ * Revision 1.7  2000/08/01 17:58:10  mdw
+ * Fix subtleties with <ctype.h> functions.
+ *
+ * Revision 1.6  2000/02/12 18:13:20  mdw
+ * Terminate tables of sources and targets.
+ *
+ * Revision 1.5  1999/10/22 22:46:44  mdw
+ * Improve documentation for conf_enum.
+ *
  * Revision 1.4  1999/10/15 21:12:36  mdw
  * Remove redundant debugging code.
  *
@@ -70,8 +79,10 @@
 
 /*----- Source and target tables ------------------------------------------*/
 
-static source_ops *sources[] = { &xsource_ops, &fsource_ops, &ssource_ops };
-static target_ops *targets[] = { &xtarget_ops, &ftarget_ops, &starget_ops };
+static source_ops *sources[] =
+  { &xsource_ops, &fsource_ops, &ssource_ops, 0 };
+static target_ops *targets[] =
+  { &xtarget_ops, &ftarget_ops, &starget_ops, 0 };
 
 static const char *notword = 0;
 static const char *notdelim = 0;
@@ -126,7 +137,7 @@ int token(scanner *sc)
       goto done;
     }
 
-    else if (isspace((unsigned char)ch))
+    else if (isspace(ch))
       ;
     else switch (ch) {
 
@@ -179,7 +190,7 @@ int token(scanner *sc)
 		goto insert;
 	      goto word;
 	    default:
-	      if (!q && isspace((unsigned char)(ch)))
+	      if (!q && isspace(ch))
 		goto word;
 	    insert:
 	      DPUTC(&sc->d, ch);
@@ -247,9 +258,15 @@ void error(scanner *sc, const char *msg, ...)
  * Returns:	Index into list, zero-based, or @-1@.
  *
  * Use:		Checks whether the current token is a string which matches
- *		one of the comma-separated items given.  If not, an error is
- *		reported; otherwise the index of the matched item is
- *		returned.
+ *		one of the comma-separated items given.  The return value is
+ *		the index (zero-based) of the matched string in the list.
+ *
+ *		The flags control the behaviour if no exact match is found.
+ *		If @ENUM_ABBREV@ is set, and the current token is a left
+ *		substring of exactly one of the possibilities, then that one
+ *		is chosen.  If @ENUM_NONE@ is set, the value @-1@ is
+ *		returned; otherwise an error is reported and the program is
+ *		terminated.
  */
 
 int conf_enum(scanner *sc, const char *list, unsigned f, const char *err)