kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix output variable and remove this->m_ to be only m_

This commit is contained in:
Andy Cedilnik 2003-01-27 12:25:34 -05:00
parent 7fcb0525b1
commit 824d9112b1
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Source/cmWin32ProcessExecution.cxx
View File

@ -264,7 +264,7 @@ bool cmWin32ProcessExecution::StartProcess(
const char* cmd, const char* path, bool verbose) const char* cmd, const char* path, bool verbose)
{ {
this->Initialize(); this->Initialize();
this->m_Verbose = verbose; m_Verbose = verbose;
return this->PrivateOpen(cmd, path, _O_RDONLY | _O_TEXT, POPEN_3); return this->PrivateOpen(cmd, path, _O_RDONLY | _O_TEXT, POPEN_3);
} }
@ -287,7 +287,8 @@ static BOOL RealPopenCreateProcess(const char *cmdstring,
HANDLE hStdout, HANDLE hStdout,
HANDLE hStderr, HANDLE hStderr,
HANDLE *hProcess, HANDLE *hProcess,
bool hideWindows) bool hideWindows,
std::string& output)
{ {
PROCESS_INFORMATION piProcInfo; PROCESS_INFORMATION piProcInfo;
STARTUPINFO siStartInfo; STARTUPINFO siStartInfo;
@ -431,9 +432,9 @@ static BOOL RealPopenCreateProcess(const char *cmdstring,
//std::cout << "Process created..." << std::endl; //std::cout << "Process created..." << std::endl;
return TRUE; return TRUE;
} }
m_Output += "CreateProcessError "; output += "CreateProcessError ";
m_Output += s2; output += s2;
m_Output += "\n"; output += "\n";
return FALSE; return FALSE;
} }
@ -637,22 +638,24 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
{ {
if (!RealPopenCreateProcess(cmdstring, if (!RealPopenCreateProcess(cmdstring,
path, path,
this->m_ConsoleSpawn.c_str(), m_ConsoleSpawn.c_str(),
hChildStdinRd, hChildStdinRd,
hChildStdoutWr, hChildStdoutWr,
hChildStdoutWr, hChildStdoutWr,
&hProcess, m_HideWindows)) &hProcess, m_HideWindows,
m_Output))
return NULL; return NULL;
} }
else else
{ {
if (!RealPopenCreateProcess(cmdstring, if (!RealPopenCreateProcess(cmdstring,
path, path,
this->m_ConsoleSpawn.c_str(), m_ConsoleSpawn.c_str(),
hChildStdinRd, hChildStdinRd,
hChildStdoutWr, hChildStdoutWr,
hChildStderrWr, hChildStderrWr,
&hProcess, m_HideWindows)) &hProcess, m_HideWindows,
m_Output))
return NULL; return NULL;
} }
@ -692,21 +695,21 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
return false; return false;
} }
this->m_ProcessHandle = hProcess; m_ProcessHandle = hProcess;
if ( fd1 >= 0 ) if ( fd1 >= 0 )
{ {
// this->m_StdIn = f1; // m_StdIn = f1;
this->m_pStdIn = fd1; m_pStdIn = fd1;
} }
if ( fd2 >= 0 ) if ( fd2 >= 0 )
{ {
// this->m_StdOut = f2; // m_StdOut = f2;
this->m_pStdOut = fd2; m_pStdOut = fd2;
} }
if ( fd3 >= 0 ) if ( fd3 >= 0 )
{ {
// this->m_StdErr = f3; // m_StdErr = f3;
this->m_pStdErr = fd3; m_pStdErr = fd3;
} }
return true; return true;
@ -751,7 +754,7 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
bool cmWin32ProcessExecution::PrivateClose(int /* timeout */) bool cmWin32ProcessExecution::PrivateClose(int /* timeout */)
{ {
HANDLE hProcess = this->m_ProcessHandle; HANDLE hProcess = m_ProcessHandle;
int result = -1; int result = -1;
DWORD exit_code; DWORD exit_code;
@ -764,8 +767,8 @@ bool cmWin32ProcessExecution::PrivateClose(int /* timeout */)
bool have_some = false; bool have_some = false;
struct _stat fsout; struct _stat fsout;
struct _stat fserr; struct _stat fserr;
int rout = _fstat(this->m_pStdOut, &fsout); int rout = _fstat(m_pStdOut, &fsout);
int rerr = _fstat(this->m_pStdErr, &fserr); int rerr = _fstat(m_pStdErr, &fserr);
if ( rout && rerr ) if ( rout && rerr )
{ {
break; break;
@ -773,9 +776,9 @@ bool cmWin32ProcessExecution::PrivateClose(int /* timeout */)
if (fserr.st_size > 0) if (fserr.st_size > 0)
{ {
char buffer[1023]; char buffer[1023];
int len = read(this->m_pStdErr, buffer, 1023); int len = read(m_pStdErr, buffer, 1023);
buffer[len] = 0; buffer[len] = 0;
if ( this->m_Verbose ) if ( m_Verbose )
{ {
std::cout << buffer << std::flush; std::cout << buffer << std::flush;
} }
@ -785,9 +788,9 @@ bool cmWin32ProcessExecution::PrivateClose(int /* timeout */)
if (fsout.st_size > 0) if (fsout.st_size > 0)
{ {
char buffer[1023]; char buffer[1023];
int len = read(this->m_pStdOut, buffer, 1023); int len = read(m_pStdOut, buffer, 1023);
buffer[len] = 0; buffer[len] = 0;
if ( this->m_Verbose ) if ( m_Verbose )
{ {
std::cout << buffer << std::flush; std::cout << buffer << std::flush;
} }
@ -831,8 +834,8 @@ bool cmWin32ProcessExecution::PrivateClose(int /* timeout */)
/* Free up the native handle at this point */ /* Free up the native handle at this point */
CloseHandle(hProcess); CloseHandle(hProcess);
this->m_ExitValue = result; m_ExitValue = result;
this->m_Output = output; m_Output += output;
if ( result < 0 ) if ( result < 0 )
{ {
return false; return false;