Fix subtleties with <ctype.h> functions.

diff --git a/conf.c b/conf.c
index dfc376583a1b06330fa46bc06dc82186caaeb0bd..d0c3f139c03c56727b1a690a035258c1c5793c05 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: conf.c,v 1.6 2000/02/12 18:13:20 mdw Exp $
+ * $Id: conf.c,v 1.7 2000/08/01 17:58:10 mdw Exp $

  *
  * Configuration parsing
  *
  *
  * Configuration parsing
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conf.c,v $
 /*----- 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.6  2000/02/12 18:13:20  mdw
  * Terminate tables of sources and targets.
  *


@@ -134,7 +137,7 @@ int token(scanner *sc)
       goto done;
     }
 
       goto done;
     }
 

-    else if (isspace((unsigned char)ch))
+    else if (isspace(ch))

       ;
     else switch (ch) {
 
       ;
     else switch (ch) {
 


@@ -187,7 +190,7 @@ int token(scanner *sc)
                goto insert;
              goto word;
            default:
                goto insert;
              goto word;
            default:

-             if (!q && isspace((unsigned char)(ch)))
+             if (!q && isspace(ch))

                goto word;
            insert:
              DPUTC(&sc->d, ch);
                goto word;
            insert:
              DPUTC(&sc->d, ch);

diff --git a/scan.c b/scan.c
index 506f98c7f8ca985f4563c1e6e51f456a260a5ca7..c29b48bb3440b1c57fef1531106143cbb143a33d 100644 (file)
--- a/scan.c
+++ b/scan.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: scan.c,v 1.2 1999/07/26 23:24:33 mdw Exp $
+ * $Id: scan.c,v 1.3 2000/08/01 17:58:10 mdw Exp $

  *
  * Character scanners
  *
  *
  * Character scanners
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: scan.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: scan.c,v $

+ * Revision 1.3  2000/08/01 17:58:10  mdw
+ * Fix subtleties with <ctype.h> functions.
+ *

  * Revision 1.2  1999/07/26 23:24:33  mdw
  * Complete rewrite.  Allow a list of character sources to enable changes
  * during parsing of syntactic constructs.
  * Revision 1.2  1999/07/26 23:24:33  mdw
  * Complete rewrite.  Allow a list of character sources to enable changes
  * during parsing of syntactic constructs.


@@ -128,7 +131,7 @@ static int avscan_scan(scansrc *ss)
   int ch;
   if (!as->p)
     ch = EOF;
   int ch;
   if (!as->p)
     ch = EOF;

-  else if ((ch = *as->p++) == 0) {
+  else if ((ch = (unsigned char)*as->p++) == 0) {

     as->ss.line++;
     as->p = *as->av++;
     ch = '\n';
     as->ss.line++;
     as->p = *as->av++;
     ch = '\n';