mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 13:45:58 +00:00
- Add <cstring> for "memset", "strchr" and "strstr"
- Use the C++ wrapper headers consistently - Fix indentation svn path=/trunk/; revision=32686
This commit is contained in:
Colin Finck
parent
1e2d76a86c
commit
ddef9f1617
|
|
@ -11,7 +11,8 @@
|
|||
#include "namedpipe_reader.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <assert.h>
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
namespace System_
|
||||
{
|
||||
|
|
@ -22,51 +23,51 @@ namespace System_
|
|||
#else
|
||||
const char * NamedPipeReader::s_LineBreak = "\x0D\x0A\0";
|
||||
#endif
|
||||
using std::vector;
|
||||
using std::vector;
|
||||
//---------------------------------------------------------------------------------------
|
||||
NamedPipeReader::NamedPipeReader() : DataSource(), h_Pipe(NULLVAL), m_Buffer(0)
|
||||
{
|
||||
}
|
||||
{
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------
|
||||
NamedPipeReader::~NamedPipeReader()
|
||||
{
|
||||
NamedPipeReader::~NamedPipeReader()
|
||||
{
|
||||
if (m_Buffer)
|
||||
free(m_Buffer);
|
||||
}
|
||||
}
|
||||
|
||||
bool NamedPipeReader::isSourceOpen()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
bool NamedPipeReader::isSourceOpen()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------
|
||||
|
||||
bool NamedPipeReader::openSource(const string & PipeCmd)
|
||||
{
|
||||
if (h_Pipe != NULLVAL)
|
||||
{
|
||||
cerr << "NamedPipeReader::openPipe> pipe already open" << endl;
|
||||
return false;
|
||||
}
|
||||
bool NamedPipeReader::openSource(const string & PipeCmd)
|
||||
{
|
||||
if (h_Pipe != NULLVAL)
|
||||
{
|
||||
cerr << "NamedPipeReader::openPipe> pipe already open" << endl;
|
||||
return false;
|
||||
}
|
||||
#ifndef __LINUX__
|
||||
h_Pipe = CreateFile(PipeCmd.c_str(),
|
||||
GENERIC_WRITE | GENERIC_READ,
|
||||
0,
|
||||
NULL,
|
||||
OPEN_EXISTING,
|
||||
FILE_ATTRIBUTE_NORMAL,
|
||||
(HANDLE)
|
||||
NULL);
|
||||
h_Pipe = CreateFile(PipeCmd.c_str(),
|
||||
GENERIC_WRITE | GENERIC_READ,
|
||||
0,
|
||||
NULL,
|
||||
OPEN_EXISTING,
|
||||
FILE_ATTRIBUTE_NORMAL,
|
||||
(HANDLE)
|
||||
NULL);
|
||||
|
||||
if(INVALID_HANDLE_VALUE == h_Pipe) {
|
||||
if(INVALID_HANDLE_VALUE == h_Pipe) {
|
||||
cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << " Error:" << GetLastError() << endl;
|
||||
h_Pipe = NULLVAL;
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl;
|
||||
h_Pipe = NULLVAL;
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl;
|
||||
|
||||
if (!m_Buffer)
|
||||
{
|
||||
|
|
@ -74,49 +75,49 @@ namespace System_
|
|||
m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength);
|
||||
}
|
||||
ConnectNamedPipe(h_Pipe,
|
||||
0);
|
||||
0);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
#else
|
||||
h_Pipe = open(PipeCmd.c_str(), O_RDONLY);
|
||||
h_Pipe = open(PipeCmd.c_str(), O_RDONLY);
|
||||
|
||||
if(INVALID_HANDLE_VALUE == h_Pipe) {
|
||||
cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << endl;
|
||||
h_Pipe = NULLVAL;
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(INVALID_HANDLE_VALUE == h_Pipe) {
|
||||
cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd << endl;
|
||||
h_Pipe = NULLVAL;
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
cout << "NamedPipeReader::openPipe> successfully opened pipe handle: "<< h_Pipe << endl << "Src: " << PipeCmd << endl;
|
||||
if (!m_Buffer)
|
||||
{
|
||||
m_BufferLength = 100;
|
||||
m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------
|
||||
|
||||
bool NamedPipeReader::closeSource()
|
||||
{
|
||||
bool NamedPipeReader::closeSource()
|
||||
{
|
||||
cerr << "NamedPipeReader::closePipe> entered" << endl;
|
||||
if (h_Pipe == NULLVAL)
|
||||
{
|
||||
cerr << "NamedPipeReader::closePipe> pipe is not open" << endl;
|
||||
return false;
|
||||
}
|
||||
if (h_Pipe == NULLVAL)
|
||||
{
|
||||
cerr << "NamedPipeReader::closePipe> pipe is not open" << endl;
|
||||
return false;
|
||||
}
|
||||
#ifdef __LINUX__
|
||||
close(h_Pipe);
|
||||
#else
|
||||
DisconnectNamedPipe(h_Pipe);
|
||||
CloseHandle(h_Pipe);
|
||||
DisconnectNamedPipe(h_Pipe);
|
||||
CloseHandle(h_Pipe);
|
||||
#endif
|
||||
h_Pipe = NULLVAL;
|
||||
return true;
|
||||
}
|
||||
h_Pipe = NULLVAL;
|
||||
return true;
|
||||
}
|
||||
//---------------------------------------------------------------------------------------
|
||||
void NamedPipeReader::insertLine(std::vector<string> & vect, string line, bool append_line)
|
||||
{
|
||||
|
|
@ -133,14 +134,14 @@ namespace System_
|
|||
|
||||
}
|
||||
//---------------------------------------------------------------------------------------
|
||||
void NamedPipeReader::extractLines(char * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead)
|
||||
{
|
||||
void NamedPipeReader::extractLines(char * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead)
|
||||
{
|
||||
#if 0
|
||||
long offset = 0;
|
||||
size_t start_size = vect.size ();
|
||||
char * start = buffer;
|
||||
buffer[cbRead] = '\0';
|
||||
char * end = strstr(buffer, s_LineBreak);
|
||||
char * end = strstr(buffer, s_LineBreak);
|
||||
|
||||
//cout << "extractLines entered with append_line: " << append_line << " cbRead: " << cbRead << "buffer: " << buffer << endl;
|
||||
|
||||
|
|
@ -189,90 +190,90 @@ namespace System_
|
|||
|
||||
#else
|
||||
DWORD buf_offset = 0;
|
||||
char * offset = strchr(buffer, '\x0D');
|
||||
while(offset)
|
||||
{
|
||||
///
|
||||
/// HACKHACK
|
||||
/// due to some mysterious reason, strchr / strstr sometimes returns
|
||||
/// not always the offset to the CR character but to the next LF
|
||||
/// in MSVC 2005 (Debug Modus)
|
||||
char * offset = strchr(buffer, '\x0D');
|
||||
while(offset)
|
||||
{
|
||||
///
|
||||
/// HACKHACK
|
||||
/// due to some mysterious reason, strchr / strstr sometimes returns
|
||||
/// not always the offset to the CR character but to the next LF
|
||||
/// in MSVC 2005 (Debug Modus)
|
||||
|
||||
if (offset[0] == '\x0A')
|
||||
{
|
||||
if (buf_offset)
|
||||
{
|
||||
offset--;
|
||||
}
|
||||
else
|
||||
{
|
||||
//TODO
|
||||
// implement me special case
|
||||
}
|
||||
}
|
||||
if (offset[0] == '\x0A')
|
||||
{
|
||||
if (buf_offset)
|
||||
{
|
||||
offset--;
|
||||
}
|
||||
else
|
||||
{
|
||||
//TODO
|
||||
// implement me special case
|
||||
}
|
||||
}
|
||||
|
||||
if (offset[0] == '\x0D')
|
||||
{
|
||||
buf_offset += 2;
|
||||
offset[0] = '\0';
|
||||
offset +=2;
|
||||
}
|
||||
else
|
||||
{
|
||||
///
|
||||
/// BUG detected in parsing code
|
||||
///
|
||||
abort();
|
||||
}
|
||||
if (offset[0] == '\x0D')
|
||||
{
|
||||
buf_offset += 2;
|
||||
offset[0] = '\0';
|
||||
offset +=2;
|
||||
}
|
||||
else
|
||||
{
|
||||
///
|
||||
/// BUG detected in parsing code
|
||||
///
|
||||
abort();
|
||||
}
|
||||
|
||||
string line = buffer;
|
||||
if (append_line)
|
||||
{
|
||||
assert(vect.empty () == false);
|
||||
string prev_line = vect[vect.size () -1];
|
||||
prev_line += line;
|
||||
vect.pop_back ();
|
||||
vect.push_back (prev_line);
|
||||
append_line = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
vect.push_back (line);
|
||||
}
|
||||
string line = buffer;
|
||||
if (append_line)
|
||||
{
|
||||
assert(vect.empty () == false);
|
||||
string prev_line = vect[vect.size () -1];
|
||||
prev_line += line;
|
||||
vect.pop_back ();
|
||||
vect.push_back (prev_line);
|
||||
append_line = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
vect.push_back (line);
|
||||
}
|
||||
|
||||
buf_offset += line.length();
|
||||
if (buf_offset >= cbRead)
|
||||
{
|
||||
break;
|
||||
}
|
||||
buffer = offset;
|
||||
buf_offset += line.length();
|
||||
if (buf_offset >= cbRead)
|
||||
{
|
||||
break;
|
||||
}
|
||||
buffer = offset;
|
||||
|
||||
offset = strstr(buffer, "\n");
|
||||
}
|
||||
if (buf_offset < cbRead)
|
||||
{
|
||||
buffer[cbRead - buf_offset] = '\0';
|
||||
string line = buffer;
|
||||
if (append_line)
|
||||
{
|
||||
assert(vect.empty () == false);
|
||||
string prev_line = vect[vect.size () -1];
|
||||
vect.pop_back ();
|
||||
prev_line += line;
|
||||
vect.push_back (prev_line);
|
||||
}
|
||||
else
|
||||
{
|
||||
vect.push_back (line);
|
||||
append_line = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
append_line = false;
|
||||
}
|
||||
offset = strstr(buffer, "\n");
|
||||
}
|
||||
if (buf_offset < cbRead)
|
||||
{
|
||||
buffer[cbRead - buf_offset] = '\0';
|
||||
string line = buffer;
|
||||
if (append_line)
|
||||
{
|
||||
assert(vect.empty () == false);
|
||||
string prev_line = vect[vect.size () -1];
|
||||
vect.pop_back ();
|
||||
prev_line += line;
|
||||
vect.push_back (prev_line);
|
||||
}
|
||||
else
|
||||
{
|
||||
vect.push_back (line);
|
||||
append_line = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
append_line = false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
//---------------------------------------------------------------------------------------
|
||||
bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long & bytesread)
|
||||
{
|
||||
|
|
@ -284,12 +285,12 @@ namespace System_
|
|||
#else
|
||||
DWORD cbRead = 0;
|
||||
BOOL fSuccess = ReadFile(h_Pipe,
|
||||
buffer,
|
||||
(bufferlength-1) * sizeof(char),
|
||||
&cbRead,
|
||||
NULL);
|
||||
|
||||
if (!fSuccess && GetLastError() != ERROR_MORE_DATA)
|
||||
buffer,
|
||||
(bufferlength-1) * sizeof(char),
|
||||
&cbRead,
|
||||
NULL);
|
||||
|
||||
if (!fSuccess && GetLastError() != ERROR_MORE_DATA)
|
||||
return false;
|
||||
#endif
|
||||
|
||||
|
|
@ -298,9 +299,9 @@ namespace System_
|
|||
}
|
||||
//---------------------------------------------------------------------------------------
|
||||
|
||||
bool NamedPipeReader::readSource(vector<string> & vect)
|
||||
{
|
||||
size_t lines = vect.size ();
|
||||
bool NamedPipeReader::readSource(vector<string> & vect)
|
||||
{
|
||||
size_t lines = vect.size ();
|
||||
|
||||
if (h_Pipe == NULLVAL)
|
||||
{
|
||||
|
|
@ -314,9 +315,9 @@ namespace System_
|
|||
return false;
|
||||
}
|
||||
|
||||
bool append_line = false;
|
||||
do
|
||||
{
|
||||
bool append_line = false;
|
||||
do
|
||||
{
|
||||
memset(m_Buffer, 0x0, m_BufferLength * sizeof(char));
|
||||
long cbRead = 0;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue