edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup

Browse source
This commit is contained in:
GreYFoXGTi 2010-10-01 13:08:13 +02:00
parent f3e33d8e82 a62a7413d1
commit e885fcb8a2
4 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/base/system.c
View file

@ -1454,6 +1454,24 @@ int str_utf8_decode(const char **ptr)
}
int str_utf8_check(const char *str)
{
while(*str)
{
if((*str&0x80) == 0x0)
str++;
else if((*str&0xE0) == 0xC0 && (*(str+1)&0xC0) == 0x80)
str += 2;
else if((*str&0xF0) == 0xE0 && (*(str+1)&0xC0) == 0x80 && (*(str+2)&0xC0) == 0x80)
str += 3;
else if((*str&0xF8) == 0xF0 && (*(str+1)&0xC0) == 0x80 && (*(str+2)&0xC0) == 0x80 && (*(str+3)&0xC0) == 0x80)
str += 4;
else
return 0;
}
return 1;
}
unsigned str_quickhash(const char *str)
{

16
src/base/system.h
View file

@ -1147,6 +1147,22 @@ int str_utf8_decode(const char **ptr);
*/
int str_utf8_encode(char *ptr, int chr);
/*
Function: str_utf8_check
Checks if a strings contains just valid utf8 characters.
Parameters:
str - Pointer to a possible utf8 string.
Returns:
0 - invalid characters found.
1 - only valid characters found.
Remarks:
- The string is treated as zero-terminated utf8 string.
*/
int str_utf8_check(const char *str);
#ifdef __cplusplus
}
#endif

23
src/engine/shared/console.cpp
View file

@ -396,7 +396,28 @@ static void StrVariableCommand(IConsole::IResult *pResult, void *pUserData, int
CStrVariableData *pData = (CStrVariableData *)pUserData;
if(pResult->NumArguments())
str_copy(pData->m_pStr, pResult->GetString(0), pData->m_MaxSize);
{
const char *pString = pResult->GetString(0);
if(!str_utf8_check(pString))
{
char Temp[4];
int Length = 0;
while(*pString)
{
int Size = str_utf8_encode(Temp, static_cast<const unsigned char>(*pString++));
if(Length+Size < pData->m_MaxSize)
{
mem_copy(pData->m_pStr+Length, &Temp, Size);
Length += Size;
}
else
break;
}
pData->m_pStr[Length] = 0;
}
else
str_copy(pData->m_pStr, pString, pData->m_MaxSize);
}
else
{
char aBuf[1024];

2
src/engine/shared/linereader.cpp
View file

@ -51,6 +51,8 @@ char *CLineReader::Get()
if(m_aBuffer[m_BufferPos] == '\n' || m_aBuffer[m_BufferPos] == '\r')
{
// line found
if(m_aBuffer[m_BufferPos] == '\r' && m_BufferPos+1 < m_BufferSize && m_aBuffer[m_BufferPos+1] == '\n')
m_aBuffer[m_BufferPos++] = 0;
m_aBuffer[m_BufferPos] = 0;
m_BufferPos++;
return &m_aBuffer[LineStart];