(ftfont_font_format): Don't use strcasestr.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c1125c9e058cfa4974957d163040f5ec5ddb0a9..030c2a186bff1bd3e2cc1efa74708536fcc58106 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-31  Kenichi Handa  <handa@m17n.org>
+
+       * ftfont.c (ftfont_font_format): Don't use strcasestr.
+
 2008-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * chartab.c (Foptimize_char_table, optimize_sub_char_table):

diff --git a/src/ftfont.c b/src/ftfont.c
index 574b7841067c06651359ccc1bec5ae331e7cb5c4..bc8c44062579ec16a501f3ebc739e9f827c49971 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1707,6 +1707,7 @@ Lisp_Object
 ftfont_font_format (FcPattern *pattern)
 {
   FcChar8 *str;
+  int len;
 
 #ifdef FC_FONTFORMAT
   if (FcPatternGetString (pattern, FC_FONTFORMAT, 0, &str) != FcResultMatch)
@@ -1722,14 +1723,19 @@ ftfont_font_format (FcPattern *pattern)
 #else  /* not FC_FONTFORMAT */
   if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
     return Qnil;
-  if (strcasestr ((char *) str, ".ttf") == 0)
-    return intern ("truetype");
-  if (strcasestr ((char *) str, "pfb") == 0)
-    return intern ("type1");
-  if (strcasestr ((char *) str, "pcf") == 0)  
-    return intern ("pcf");
-  if (strcasestr ((char *) str, "bdf") == 0)  
-    return intern ("bdf");
+  len = strlen ((char *) str);
+  if (len >= 4)
+    {
+      str += len - 4;
+      if (xstrcasecmp ((char *) str, ".ttf") == 0)
+       return intern ("truetype");
+      if (xstrcasecmp ((char *) str, "pfb") == 0)
+       return intern ("type1");
+      if (xstrcasecmp ((char *) str, "pcf") == 0)  
+       return intern ("pcf");
+      if (xstrcasecmp ((char *) str, "bdf") == 0)  
+       return intern ("bdf");
+    }
 #endif /* not FC_FONTFORMAT */
   return intern ("unknown");
 }