Changeset 2371:62965bc72607 for charset.c

Timestamp:

2001-04-26 06:36:33 (8 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Add ascii_strcasecmp() and ascii_strncasecmp() functions which do
locale-independent and case-insensitive string comparisons. Needed
for mutt to work in iso-8859-9 environments, where tolower('I') !=
'i'.

Files:

• charset.c (modified) (5 diffs)

charset.c

@@ -174 +174 @@
   { "latin9",           "iso-8859-15"   }, /* this is not a bug */
   
-  { "�59-9",    "iso-8859-9"    }, /* work around a problem:
-                                            * In iso-8859-9, the lower-
-                                            * case version of I is �                * not i.
-                                            */
-  
   
   /*
@@ -247 +242 @@
 
   /* catch some common iso-8859-something misspellings */
-  if (!mutt_strncasecmp (name, "8859", 4) && name[4] != '-')
+  if (!ascii_strncasecmp (name, "8859", 4) && name[4] != '-')
     snprintf (scratch, sizeof (scratch), "iso-8859-%s", name +4);
-  else if (!mutt_strncasecmp (name, "8859-", 5))
+  else if (!ascii_strncasecmp (name, "8859-", 5))
     snprintf (scratch, sizeof (scratch), "iso-8859-%s", name + 5);
-  else if (!mutt_strncasecmp (name, "iso8859", 7) && name[7] != '-')
+  else if (!ascii_strncasecmp (name, "iso8859", 7) && name[7] != '-')
     snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 7);
-  else if (!mutt_strncasecmp (name, "iso8859-", 8))
+  else if (!ascii_strncasecmp (name, "iso8859-", 8))
     snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8);
   else
@@ -259 +254 @@
 
   for (i = 0; PreferredMIMENames[i].key; i++)
-    if (!mutt_strcasecmp (scratch, PreferredMIMENames[i].key))
+    if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
+        !mutt_strcasecmp (scratch, PreferredMIMENames[i].key))
     {
       strfcpy (dest, PreferredMIMENames[i].pref, dlen);
@@ -269 +265 @@
   /* for cosmetics' sake, transform to lowercase. */
   for (p = dest; *p; p++)
-    if (isupper (*p))
-      *p = tolower (*p);
+    *p = ascii_tolower (*p);
 }
 
@@ -280 +275 @@
 
   mutt_canonical_charset (buffer, sizeof (buffer), s);
-  return !mutt_strcasecmp (buffer, chs);
+  return !ascii_strcasecmp (buffer, chs);
 }