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

fixed possible CRLF line ending problem in the linereader

Browse source
This commit is contained in:
oy 2011-01-20 21:17:11 +01:00
parent 7c67a1334c
commit ce42fa68ff
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
void CLineReader::Init(IOHANDLE io)
{
m_BufferMaxSize = 4*1024;
m_BufferMaxSize = sizeof(m_aBuffer);
m_BufferSize = 0;
m_BufferPos = 0;
m_IO = io;
@ -13,6 +13,7 @@ void CLineReader::Init(IOHANDLE io)
char *CLineReader::Get()
{
unsigned LineStart = m_BufferPos;
bool CRLFBreak = false;
while(1)
{
@ -53,10 +54,25 @@ 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')
if(m_aBuffer[m_BufferPos] == '\r')
{
if(m_BufferPos+1 >= m_BufferSize)
{
// read more to get the connected '\n'
CRLFBreak = true;
++m_BufferPos;
continue;
}
else if(m_aBuffer[m_BufferPos+1] == '\n')
m_aBuffer[m_BufferPos++] = 0;
}
m_aBuffer[m_BufferPos++] = 0;
return &m_aBuffer[LineStart];
}
else if(CRLFBreak)
{
if(m_aBuffer[m_BufferPos] == '\n')
m_aBuffer[m_BufferPos++] = 0;
m_aBuffer[m_BufferPos] = 0;
m_BufferPos++;
return &m_aBuffer[LineStart];
}
else