X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/193489472a436a4437498b448e11e8992baaaf67..c0591ef34ea123aa8c709bda122308256d2c84cd:/uip/picksbr.c

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 3d4e9782..1154f46c 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -3,11 +3,16 @@
  * picksbr.c -- routines to help pick along...
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
 #include <h/picksbr.h>
+#include <h/utils.h>
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -690,7 +695,7 @@ plist
 	if (*p2 == CCHR) {
 	    c = p2[1];
 	    do {
-		if (*p1 == c || cc[(int)*p1] == c)
+		if (*p1 == c || cc[(unsigned char)*p1] == c)
 		    if (advance (p1, p2))
 			return 1;
 	    } while (*p1++);
@@ -715,7 +720,7 @@ advance (char *alp, char *aep)
     for (;;)
 	switch (*ep++) {
 	    case CCHR: 
-		if (*ep++ == *lp++ || ep[-1] == cc[(int)lp[-1]])
+		if (*ep++ == *lp++ || ep[-1] == cc[(unsigned char)lp[-1]])
 		    continue;
 		return 0;
 
@@ -754,7 +759,7 @@ advance (char *alp, char *aep)
 
 	    case CCHR | STAR: 
 		curlp = lp;
-		while (*lp++ == *ep || cc[(int)lp[-1]] == *ep)
+		while (*lp++ == *ep || cc[(unsigned char)lp[-1]] == *ep)
 		    continue;
 		ep++;
 		goto star;