* mk-amd-map/mk-amd-map.c (read_file_file), libamu/util.c

(strsplit), libamu/hasmntopt.c (nextmntopt), amd/sun_map.c
(sun_entry2amd), amd/sun2amd.c (sun2amd_convert_convert),
amd/mapc.c (mapc_add_kv), amd/info_file.c (file_search_or_reload),
amd/info_exec.c (exec_parse_qanswer): cast isspace() arg to
unsigned char, which is safer as per Christos.

diff --git a/ChangeLog b/ChangeLog
index b976fcaf830b389c28942ebb4df3db059198d58e..51277dd361bdca29d29d94ae41230abb2e1ee901 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-09-13  Erez Zadok  <ezk@cs.sunysb.edu>
 
+       * mk-amd-map/mk-amd-map.c (read_file_file), libamu/util.c
+       (strsplit), libamu/hasmntopt.c (nextmntopt), amd/sun_map.c
+       (sun_entry2amd), amd/sun2amd.c (sun2amd_convert_convert),
+       amd/mapc.c (mapc_add_kv), amd/info_file.c (file_search_or_reload),
+       amd/info_exec.c (exec_parse_qanswer): cast isspace() arg to
+       unsigned char, which is safer as per Christos.
+
        * amd/sun_map.c (sun_entry2amd): isspace takes an int, not a char.
 
        * configure.in: keep a dummy unused AM_PROG_LEX, because old

diff --git a/amd/info_exec.c b/amd/info_exec.c
index 5737c36b2d843ce9a1d685455de730414f2bd807..9e0894362fe9f1a2811801eb79a6feaca76cc358 100644 (file)
--- a/amd/info_exec.c
+++ b/amd/info_exec.c
@@ -197,7 +197,7 @@ exec_parse_qanswer(mnt_map *m, int fd, char *map, char *key, char **pval, time_t
     /*
      * Find beginning of value (query answer)
      */
-    for (cp = qanswer; *cp && !isascii((int)*cp) && !isspace((int)*cp); cp++)
+    for (cp = qanswer; *cp && !isascii((unsigned char)*cp) && !isspace((unsigned char)*cp); cp++)
       ;;
 
     /* Ignore blank lines */

diff --git a/amd/info_file.c b/amd/info_file.c
index c672509349862f938f1f478455709029f2a0388a..0acd09b8eeebdccf4667f9c28e86789661502c7f 100644 (file)
--- a/amd/info_file.c
+++ b/amd/info_file.c
@@ -133,7 +133,7 @@ file_search_or_reload(mnt_map *m,
     /*
      * Find start of key
      */
-    for (kp = key_val; *kp && isascii(*kp) && isspace((int)*kp); kp++) ;
+    for (kp = key_val; *kp && isascii(*kp) && isspace((unsigned char)*kp); kp++) ;
 
     /*
      * Ignore blank lines
@@ -144,7 +144,7 @@ file_search_or_reload(mnt_map *m,
     /*
      * Find end of key
      */
-    for (cp = kp; *cp && (!isascii(*cp) || !isspace((int)*cp)); cp++) ;
+    for (cp = kp; *cp && (!isascii(*cp) || !isspace((unsigned char)*cp)); cp++) ;
 
     /*
      * Check whether key matches
@@ -153,7 +153,7 @@ file_search_or_reload(mnt_map *m,
       *cp++ = '\0';
 
     if (fn || (*key == *kp && STREQ(key, kp))) {
-      while (*cp && isascii(*cp) && isspace((int)*cp))
+      while (*cp && isascii(*cp) && isspace((unsigned char)*cp))
        cp++;
       if (*cp) {
        /*

diff --git a/amd/mapc.c b/amd/mapc.c
index 206287c4727b73fc7137d972d69e49d6a8bb2bed..4aab31a0dedaa7b12db219e66fbc4b3ed3589d42 100644 (file)
--- a/amd/mapc.c
+++ b/amd/mapc.c
@@ -454,7 +454,7 @@ mapc_add_kv(mnt_map *m, char *key, char *val)
     while ((tok = strtok(NULL, "\n")) != NULL) {
       key = tok;
       /* find the entry */
-      for (entry = key; *entry && !isspace((int)*entry); entry++);
+      for (entry = key; *entry && !isspace((unsigned char)*entry); entry++);
       if (*entry) {
        *entry++ = '\0';
       }

diff --git a/amd/sun2amd.c b/amd/sun2amd.c
index ea3971e0e7c1e90316b6a33cbd10087ab0c59cca..165faaf6ce86321056246bea18d73e45a707b90a 100644 (file)
--- a/amd/sun2amd.c
+++ b/amd/sun2amd.c
@@ -83,7 +83,7 @@ sun2amd_convert(FILE *sun_in, FILE *amd_out)
 
     /* find start of key */
     key = line_buff;
-    while (*key != '\0' && isspace((int)*key)) {
+    while (*key != '\0' && isspace((unsigned char)*key)) {
       key++;
     }
 
@@ -94,7 +94,7 @@ sun2amd_convert(FILE *sun_in, FILE *amd_out)
 
     /* find the end of the key and NULL terminate */
     tmp = key;
-    while (*tmp != '\0' && isspace((int)*tmp) == 0) {
+    while (*tmp != '\0' && isspace((unsigned char)*tmp) == 0) {
       tmp++;
     }
     if (*tmp == '\0') {

diff --git a/amd/sun_map.c b/amd/sun_map.c
index 27e7c9450c87e18d30990dee4e07ba9a20a16575..846fff94b1f515658169a40f2b8c46b4247cd8df 100644 (file)
--- a/amd/sun_map.c
+++ b/amd/sun_map.c
@@ -533,7 +533,7 @@ sun_entry2amd(const char *key, const char *s_entry_str)
   /* Make sure there are no trailing white spaces or '\n'. */
   xstrlcpy(line_buff, s_entry_str, sizeof(line_buff));
   ws = strlen(line_buff) - 1;
-  while (ws >= 0 && (isspace((int)line_buff[ws]) || line_buff[ws] == '\n')) {
+  while (ws >= 0 && (isspace((unsigned char)line_buff[ws]) || line_buff[ws] == '\n')) {
     line_buff[ws--] = '\0';
   }
 

diff --git a/libamu/hasmntopt.c b/libamu/hasmntopt.c
index 47f3dc696f1477ecc903a9c2d2c0f445665f57ca..4ac92ca301802fd94ea27fe5ffb2b756e94b66c4 100644 (file)
--- a/libamu/hasmntopt.c
+++ b/libamu/hasmntopt.c
@@ -68,7 +68,7 @@ nextmntopt(char **p)
   /*
    * Skip past white space
    */
-  while (*cp && isspace((int) *cp))
+  while (*cp && isspace((unsigned char) *cp))
     cp++;
 
   /*

diff --git a/libamu/strutil.c b/libamu/strutil.c
index 556fb07aadf56c78fea651f7d711d23d50d839e0..5e93ee31a829eb88a5fe22ef8321770a1af6bb16 100644 (file)
--- a/libamu/strutil.c
+++ b/libamu/strutil.c
@@ -139,7 +139,7 @@ strsplit(char *s, int ch, int qc)
     /*
      * skip to split char
      */
-    while (*s && (ch == ' ' ? (isascii(*s) && isspace((int)*s)) : *s == ch))
+    while (*s && (ch == ' ' ? (isascii(*s) && isspace((unsigned char)*s)) : *s == ch))
       *s++ = '\0';
 
     /*
@@ -156,7 +156,7 @@ strsplit(char *s, int ch, int qc)
     /*
      * skip to split char
      */
-    while (*s && !(ch == ' ' ? (isascii(*s) && isspace((int)*s)) : *s == ch)) {
+    while (*s && !(ch == ' ' ? (isascii(*s) && isspace((unsigned char)*s)) : *s == ch)) {
       if (*s++ == qc) {
        /*
         * Skip past string.

diff --git a/mk-amd-map/mk-amd-map.c b/mk-amd-map/mk-amd-map.c
index f47d1e5daeef1e2580aec87a3cd7d4be9454d332..9119cbe7942005a1099e57bc3eb7a2481291d6a1 100644 (file)
--- a/mk-amd-map/mk-amd-map.c
+++ b/mk-amd-map/mk-amd-map.c
@@ -144,7 +144,7 @@ read_file(FILE *fp, char *map, voidp db)
     /*
      * Find start of key
      */
-    for (kp = key_val; *kp && isascii(*kp) && isspace((int)*kp); kp++) ;
+    for (kp = key_val; *kp && isascii(*kp) && isspace((unsigned char)*kp); kp++) ;
 
     /*
      * Ignore blank lines
@@ -155,7 +155,7 @@ read_file(FILE *fp, char *map, voidp db)
     /*
      * Find end of key
      */
-    for (cp = kp; *cp && (!isascii(*cp) || !isspace((int)*cp)); cp++) ;
+    for (cp = kp; *cp && (!isascii(*cp) || !isspace((unsigned char)*cp)); cp++) ;
 
     /*
      * Check whether key matches, or whether
@@ -163,7 +163,7 @@ read_file(FILE *fp, char *map, voidp db)
      */
     if (*cp)
       *cp++ = '\0';
-    while (*cp && isascii(*cp) && isspace((int)*cp))
+    while (*cp && isascii(*cp) && isspace((unsigned char)*cp))
       cp++;
     if (*kp == '+') {
       fprintf(stderr, "Can't interpolate %s\n", kp);