Changeset 3441:f78b184ef598

Timestamp:

2003-07-24 11:40:50 (5 years ago)

Author:

Vincent Lefevre <vincent@…>

Branch:

HEAD

Message:

Some functions/macros like isspace take an int and require the
argument to have the value of an unsigned char (or EOF). Under
Solaris, gcc complains when the argument is a char (as this is a
possible bug, on platforms where char is signed, like Solaris). The
attached patch fixes such problems (well, perhaps I've changed more
than necessary, but this doesn't hurt).

Files:

• alias.c (modified) (1 diff)
• copy.c (modified) (1 diff)
• handler.c (modified) (1 diff)
• imap/command.c (modified) (2 diffs)
• imap/imap.c (modified) (1 diff)
• imap/message.c (modified) (1 diff)
• imap/util.c (modified) (1 diff)
• init.c (modified) (2 diffs)
• intl/l10nflist.c (modified) (2 diffs)
• intl/loadmsgcat.c (modified) (1 diff)
• intl/localealias.c (modified) (4 diffs)
• keymap.c (modified) (1 diff)
• lib.c (modified) (2 diffs)
• makedoc.c (modified) (5 diffs)
• muttlib.c (modified) (1 diff)
• pattern.c (modified) (2 diffs)
• rfc2047.c (modified) (1 diff)
• rfc2231.c (modified) (2 diffs)
• rfc822.c (modified) (3 diffs)
• strcasecmp.c (modified) (2 diffs)
• url.c (modified) (1 diff)

alias.c

@@ -354 +354 @@
 {
   return (c == '-' || c == '_' || c == '+' || c == '=' || c == '.' ||
-          isalnum (c));
+          isalnum ((unsigned char) c));
 }
 

copy.c

@@ -845 +845 @@
   ADDRESS *a = NULL;
 
-  switch (tolower (*s))
+  switch (tolower ((unsigned char) *s))
   {
     case 'r': 

handler.c

@@ -155 +155 @@
   
   /* quoted-printable triple */
-  if (*s == '=' && isxdigit (*(s+1)) && isxdigit (*(s+2)))
+  if (*s == '=' &&
+      isxdigit ((unsigned char) *(s+1)) &&
+      isxdigit ((unsigned char) *(s+2)))
   {
     *d = (hexval (*(s+1)) << 4) | hexval (*(s+2));

imap/command.c

@@ -309 +309 @@
   s = imap_next_word (idata->cmd.buf);
 
-  if ((idata->state == IMAP_SELECTED) && isdigit (*s))
+  if ((idata->state == IMAP_SELECTED) && isdigit ((unsigned char) *s))
   {
     pn = s;
@@ -526 +526 @@
   memset (idata->rights, 0, sizeof (idata->rights));
 
-  while (*s && !isspace(*s))
+  while (*s && !isspace((unsigned char) *s))
   {
     switch (*s) 

imap/imap.c

@@ -1235 +1235 @@
         s = imap_next_word (s);
         s = imap_next_word (s);
-        if (isdigit (*s))
+        if (isdigit ((unsigned char) *s))
         {
           if (*s != '0')

imap/message.c

@@ -853 +853 @@
       SKIPWS (s);
       ptmp = tmp;
-      while (isdigit (*s))
+      while (isdigit ((unsigned char) *s))
         *ptmp++ = *s++;
       *ptmp = 0;

imap/util.c

@@ -311 +311 @@
   pc++;
   pn = pc;
-  while (isdigit (*pc))
+  while (isdigit ((unsigned char) *pc))
     pc++;
   *pc = 0;

init.c

@@ -140 +140 @@
             if (!*tok->dptr)
                 return -1; /* premature end of token */
-          mutt_buffer_addch (dest, (toupper (*tok->dptr) - '@') & 0x7f);
+          mutt_buffer_addch (dest, (toupper ((unsigned char) *tok->dptr)
+                                    - '@') & 0x7f);
           tok->dptr++;
           break;
@@ -181 +182 @@
         mutt_buffer_addch (dest, '\033');
       else if (isalpha ((unsigned char) ch))
-        mutt_buffer_addch (dest, toupper (ch) - '@');
+        mutt_buffer_addch (dest, toupper ((unsigned char) ch) - '@');
       else
       {

intl/l10nflist.c

@@ -357 +357 @@
 
   for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum (codeset[cnt]))
+    if (isalnum ((unsigned char) codeset[cnt]))
       {
         ++len;
 
-        if (isalpha (codeset[cnt]))
+        if (isalpha ((unsigned char) codeset[cnt]))
           only_digit = 0;
       }
@@ -375 +375 @@
 
       for (cnt = 0; cnt < name_len; ++cnt)
-        if (isalpha (codeset[cnt]))
-          *wp++ = tolower (codeset[cnt]);
-        else if (isdigit (codeset[cnt]))
+        if (isalpha ((unsigned char) codeset[cnt]))
+          *wp++ = tolower ((unsigned char) codeset[cnt]);
+        else if (isdigit ((unsigned char) codeset[cnt]))
           *wp++ = codeset[cnt];
 

intl/loadmsgcat.c

@@ -509 +509 @@
 
           nplurals += 9;
-          while (*nplurals != '\0' && isspace (*nplurals))
+          while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
             ++nplurals;
 #if defined HAVE_STRTOUL || defined _LIBC

intl/localealias.c

@@ -245 +245 @@
       cp = buf;
       /* Ignore leading white space.  */
-      while (isspace (cp[0]))
+      while (isspace ((unsigned char) cp[0]))
         ++cp;
 
@@ -252 +252 @@
         {
           alias = cp++;
-          while (cp[0] != '\0' && !isspace (cp[0]))
+          while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
             ++cp;
           /* Terminate alias name.  */
@@ -259 +259 @@
 
           /* Now look for the beginning of the value.  */
-          while (isspace (cp[0]))
+          while (isspace ((unsigned char) cp[0]))
             ++cp;
 
@@ -268 +268 @@
 
               value = cp++;
-              while (cp[0] != '\0' && !isspace (cp[0]))
+              while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
                 ++cp;
               /* Terminate value.  */

keymap.c

@@ -121 +121 @@
 static int parse_keycode (const char *s)
 {
-  if (isdigit (s[1]) && isdigit (s[2]) && isdigit (s[3]) && s[4] == '>')
+  if (isdigit ((unsigned char) s[1]) &&
+      isdigit ((unsigned char) s[2]) &&
+      isdigit ((unsigned char) s[3]) &&
+      s[4] == '>')
   {
     return (s[3] - '0') + (s[2] - '0') * 8 + (s[1] - '0') * 64;

lib.c

@@ -171 +171 @@
   while (*p)
   {
-    *p = tolower (*p);
+    *p = tolower ((unsigned char) *p);
     p++;
   }
@@ -609 +609 @@
   while (*(p = haystack))
   {
-    for (q = needle; *p && *q && tolower (*p) == tolower (*q); p++, q++)
+    for (q = needle;
+         *p && *q &&
+           tolower ((unsigned char) *p) == tolower ((unsigned char) *q);
+         p++, q++)
       ;
     if (!*q)

makedoc.c

@@ -219 +219 @@
 static char *skip_ws (char *s)
 {
-  while (*s && isspace (*s))
+  while (*s && isspace ((unsigned char) *s))
     s++;
 
@@ -301 +301 @@
     else if (!is_quoted && strchr (single_char_tokens, *t))
       break;
-    else if (!is_quoted && isspace (*t))
+    else if (!is_quoted && isspace ((unsigned char) *t))
       break;
     else
@@ -487 +487 @@
       /* heuristic! */
       strncpy (t, s + 5, l);
-      for (; *t; t++) *t = tolower (*t);
+      for (; *t; t++) *t = tolower ((unsigned char) *t);
       break;
     }
@@ -494 +494 @@
       /* heuristic! */
       strncpy (t, s + 2, l);
-      for (; *t; t++) *t = tolower (*t);
+      for (; *t; t++) *t = tolower ((unsigned char) *t);
       break;
     }
@@ -1189 +1189 @@
       {
         ref = s;
-        while (isalnum (*s) || *s == '-' || *s == '_')
+        while (isalnum ((unsigned char) *s) || *s == '-' || *s == '_')
           ++s;
 

muttlib.c

@@ -522 +522 @@
                MAX(destlen - idx - pwnl - 1, 0));
       memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl));
-      dest[idx] = toupper (dest[idx]);
+      dest[idx] = toupper ((unsigned char) dest[idx]);
     }
   }

pattern.c

@@ -279 +279 @@
     else
       pat->min = strtol (s->dptr, &tmp, 0);
-    if (toupper (*tmp) == 'K') /* is there a prefix? */
+    if (toupper ((unsigned char) *tmp) == 'K') /* is there a prefix? */
     {
       pat->min *= 1024;
       tmp++;
     }
-    else if (toupper (*tmp) == 'M')
+    else if (toupper ((unsigned char) *tmp) == 'M')
     {
       pat->min *= 1048576;
@@ -313 +313 @@
     /* range maximum */
     pat->max = strtol (tmp, &tmp, 0);
-    if (toupper (*tmp) == 'K')
+    if (toupper ((unsigned char) *tmp) == 'K')
     {
       pat->max *= 1024;
       tmp++;
     }
-    else if (toupper (*tmp) == 'M')
+    else if (toupper ((unsigned char) *tmp) == 'M')
     {
       pat->max *= 1048576;

rfc2047.c

@@ -607 +607 @@
         break;
       case 3:
-        if (toupper (*pp) == 'Q')
+        if (toupper ((unsigned char) *pp) == 'Q')
           enc = ENCQUOTEDPRINTABLE;
-        else if (toupper (*pp) == 'B')
+        else if (toupper ((unsigned char) *pp) == 'B')
           enc = ENCBASE64;
         else

rfc2231.c

@@ -136 +136 @@
     {
       *s = '\0'; s++; /* let s point to the first character of index. */
-      for (t = s; *t && isdigit (*t); t++)
+      for (t = s; *t && isdigit ((unsigned char) *t); t++)
         ;
       encoded = (*t == '*');
@@ -209 +209 @@
   for (d = dest; *src; src++)
   {
-    if (*src == '%' && isxdigit (*(src + 1)) && isxdigit (*(src + 2)))
+    if (*src == '%' &&
+        isxdigit ((unsigned char) *(src + 1)) &&
+        isxdigit ((unsigned char) *(src + 2)))
     {
       *d++ = (hexval (*(src + 1)) << 4) | (hexval (*(src + 2)));

rfc822.c

@@ -175 +175 @@
   while (*s)
   {
-    if (ISSPACE (*s) || is_special (*s))
+    if (ISSPACE ((unsigned char) *s) || is_special (*s))
       break;
     if (*tokenlen < tokenmax)
@@ -346 +346 @@
     last = last->next;
 
-  ws_pending = isspace (*s);
+  ws_pending = isspace ((unsigned char) *s);
   
   SKIPWS (s);
@@ -480 +480 @@
       s = ps;
     }
-    ws_pending = isspace (*s);
+    ws_pending = isspace ((unsigned char) *s);
     SKIPWS (s);
   }

strcasecmp.c

@@ -10 +10 @@
   while (*s1 && *s2 && l < n)
   {
-    c1 = tolower (*s1);
-    c2 = tolower (*s2);
+    c1 = tolower ((unsigned char) *s1);
+    c2 = tolower ((unsigned char) *s2);
     if (c1 != c2)
       return (c1 - c2);
@@ -30 +30 @@
   while (*s1 && *s2)
   {
-    c1 = tolower (*s1);
-    c2 = tolower (*s2);
+    c1 = tolower ((unsigned char) *s1);
+    c2 = tolower ((unsigned char) *s2);
     if (c1 != c2)
       return (c1 - c2);

url.c

@@ -51 +51 @@
   {
     if (*s == '%' && s[1] && s[2] &&
-        isxdigit (s[1]) && isxdigit (s[2]) &&
+        isxdigit ((unsigned char) s[1]) &&
+        isxdigit ((unsigned char) s[2]) &&
         hexval (s[1]) >= 0 && hexval (s[2]) >= 0)
     {