Get rid of strlwr().

Besides being non-standard and present only on some platforms, it cannot be
extended to Unicode as some characters expand or contract while being
upper/lowercased.

1 files changed, 7 insertions, 11 deletions

diff --git a/crawl-ref/source/dbg-util.cc b/crawl-ref/source/dbg-util.cc
index c1f7ff593c..b9f6056777 100644
--- a/crawl-ref/source/dbg-util.cc
+++ b/crawl-ref/source/dbg-util.cc
@@ -326,6 +326,7 @@ skill_type debug_prompt_for_skill(const char *prompt)
 
     if (specs[0] == '\0')
         return (SK_NONE);
+    std::string spec = lowercase_string(specs);
 
     skill_type skill = SK_NONE;
 
@@ -336,20 +337,15 @@ skill_type debug_prompt_for_skill(const char *prompt)
         if (is_invalid_skill(sk))
             continue;
 
-        char sk_name[80];
-        strncpy(sk_name, skill_name(sk), sizeof(sk_name));
+        std::string sk_name = lowercase_string(skill_name(sk));
 
-        char *ptr = strstr(strlwr(sk_name), strlwr(specs));
-        if (ptr != NULL)
+        size_t pos = sk_name.find(spec);
+        if (pos != std::string::npos)
         {
-            if (ptr == sk_name && strlen(specs) > 0)
-            {
-                // We prefer prefixes over partial matches.
-                skill = sk;
+            skill = sk;
+            // We prefer prefixes over partial matches.
+            if (!pos)
                 break;
-            }
-            else
-                skill = sk;
         }
     }