Merge pull request #101 from SunTrustDev/bugfix/tolower_breaking_utf8
tolower breaking utf8
This commit is contained in:
@@ -3,13 +3,12 @@
|
||||
|
||||
static std::list<std::string> s_stList;
|
||||
|
||||
char korean_tolower(const char c)
|
||||
char ascii_tolower(const char c)
|
||||
{
|
||||
char ret = c;
|
||||
if (c >= 'A' && c <= 'Z')
|
||||
ret = c - 'A' + 'a';
|
||||
|
||||
assert(ret == tolower(c));
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -25,7 +24,7 @@ std::string& stl_static_string(const char * c_sz)
|
||||
void stl_lowers(std::string& rstRet)
|
||||
{
|
||||
for (size_t i = 0; i < rstRet.length(); ++i)
|
||||
rstRet[i] = korean_tolower(rstRet[i]);
|
||||
rstRet[i] = ascii_tolower(rstRet[i]);
|
||||
}
|
||||
|
||||
int split_string(const std::string& input, const std::string& delimiter, std::vector<std::string>& results, bool includeEmpties)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#pragma warning ( pop )
|
||||
|
||||
extern char korean_tolower(const char c);
|
||||
extern char ascii_tolower(const char c);
|
||||
extern std::string& stl_static_string(const char* c_sz);
|
||||
extern void stl_lowers(std::string& rstRet);
|
||||
extern int split_string(const std::string & input, const std::string & delimiter, std::vector<std::string>& results, bool includeEmpties);
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "Utils.h"
|
||||
#include "filedir.h"
|
||||
|
||||
char korean_tolower(const char c);
|
||||
char ascii_tolower(const char c);
|
||||
|
||||
const char* CreateTempFileName(const char* c_pszPrefix)
|
||||
{
|
||||
@@ -293,7 +293,7 @@ void StringLowers(char * String)
|
||||
{
|
||||
for (DWORD i = 0; i < strlen(String); ++i)
|
||||
{
|
||||
String[i] = korean_tolower(String[i]);
|
||||
String[i] = ascii_tolower(String[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -304,7 +304,7 @@ void StringPath(std::string & rString)
|
||||
if (rString[i] == '\\')
|
||||
rString[i] = '/';
|
||||
else
|
||||
rString[i] = korean_tolower(rString[i]);
|
||||
rString[i] = ascii_tolower(rString[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -315,7 +315,7 @@ void StringPath(char * pString)
|
||||
if (pString[i] == '\\')
|
||||
pString[i] = '/';
|
||||
else
|
||||
pString[i] = korean_tolower(pString[i]);
|
||||
pString[i] = ascii_tolower(pString[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -326,7 +326,7 @@ void StringPath(const char * c_szSrc, char * szDest)
|
||||
if (c_szSrc[i] == '\\')
|
||||
szDest[i] = '/';
|
||||
else
|
||||
szDest[i] = korean_tolower(c_szSrc[i]);
|
||||
szDest[i] = ascii_tolower(c_szSrc[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -340,7 +340,7 @@ void StringPath(const char * c_szSrc, std::string & rString)
|
||||
if (c_szSrc[i] == '\\')
|
||||
rString[i] = '/';
|
||||
else
|
||||
rString[i] = korean_tolower(c_szSrc[i]);
|
||||
rString[i] = ascii_tolower(c_szSrc[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -120,7 +120,7 @@ int CResource::ConvertPathName(const char * c_szPathName, char * pszRetPathName,
|
||||
if (*pc == '/')
|
||||
*(pszRetPathName++) = '\\';
|
||||
else
|
||||
*(pszRetPathName++) = (char) korean_tolower(*pc);
|
||||
*(pszRetPathName++) = (char) ascii_tolower(*pc);
|
||||
}
|
||||
|
||||
*pszRetPathName = '\0';
|
||||
|
||||
@@ -236,7 +236,7 @@ int __ConvertPathName(const char * c_szPathName, char * pszRetPathName, int retL
|
||||
if (*pc == '/')
|
||||
*(pszRetPathName++) = '\\';
|
||||
else
|
||||
*(pszRetPathName++) = (char) korean_tolower(*pc);
|
||||
*(pszRetPathName++) = (char) ascii_tolower(*pc);
|
||||
}
|
||||
|
||||
*pszRetPathName = '\0';
|
||||
@@ -374,7 +374,7 @@ DWORD CResourceManager::__GetFileCRC(const char * c_szFileName, const char ** c_
|
||||
if (src[len]=='/')
|
||||
dst[len] = '\\';
|
||||
else
|
||||
dst[len] = (char) korean_tolower(src[len]);
|
||||
dst[len] = (char) ascii_tolower(src[len]);
|
||||
|
||||
++len;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user