Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 08:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

- improve namedpipe_reader parsing of lines code

Browse source 
- it should now be able handle partial / full lines

svn path=/trunk/; revision=24697
This commit is contained in:
Johannes Anderwald 2006-11-06 23:50:03 +00:00
parent 19c938e607
commit 4a941a0b25
1 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
reactos/tools/sysreg/namedpipe_reader.cpp
View file

@ -95,11 +95,43 @@ namespace System_
//---------------------------------------------------------------------------------------
void NamedPipeReader::extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead)
{
TCHAR * offset = _tcsstr(buffer, _T("\x0D"));
TCHAR * offset = _tcschr(buffer, _T('\x0D'));
DWORD buf_offset = 0;
while(offset)
{
offset[0] = _T('\0');
///
/// HACKHACK
/// due to some mysterious reason, _tcschr / _tcsstr sometimes returns
/// not always the offset to the CR character but to the next LF
/// in MSVC 2005 (Debug Modus)
if (offset[0] == _T('\x0A'))
{
if (buf_offset)
{
offset--;
}
else
{
//TODO
// implement me special case
}
}
if (offset[0] == _T('\x0D'))
{
buf_offset += 2;
offset[0] = _T('\0');
offset +=2;
}
else
{
///
/// BUG detected in parsing code
///
abort();
}
string line = buffer;
if (append_line)
{
@ -115,18 +147,18 @@ namespace System_
vect.push_back (line);
}
offset += 2;
buf_offset += line.length () + 2;
buf_offset += line.length();
if (buf_offset >= cbRead)
{
break;
}
buffer = offset;
offset = _tcsstr(buffer, _T("\n"));
}
if (buf_offset < cbRead)
{
buffer[cbRead - buf_offset] = _T('\0');
string line = buffer;
if (append_line)
{
@ -195,7 +227,7 @@ namespace System_
#endif
} while (!fSuccess); // repeat loop if ERROR_MORE_DATA
} while (localbuf[strlen(localbuf)-1] != '\n');
} while (append_line);
if (!fSuccess)
return 0;