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

Remove warnings and fix potential bug

This commit is contained in:
Andy Cedilnik 2002-09-30 07:55:31 -04:00
parent be6a5696ba
commit b7789388d3
1 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Source/cmWin32ProcessExecution.cxx
View File

@ -256,7 +256,6 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
BOOL fSuccess; BOOL fSuccess;
int fd1, fd2, fd3; int fd1, fd2, fd3;
//FILE *f1, *f2, *f3; //FILE *f1, *f2, *f3;
long file_count;
saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
saAttr.bInheritHandle = TRUE; saAttr.bInheritHandle = TRUE;
@ -369,25 +368,26 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
PERROR("CloseHandle"); PERROR("CloseHandle");
break; break;
} }
file_count = 1;
break; break;
case POPEN_2: case POPEN_2:
case POPEN_4: case POPEN_4:
if ( 1 ) if ( 1 )
{ {
char *m1, *m2; // Comment this out. Maybe we will need it in the future.
// file IO access to the process might be cool.
//char *m1, *m2;
if (mode && _O_TEXT) //if (mode && _O_TEXT)
{ // {
m1 = "r"; // m1 = "r";
m2 = "w"; // m2 = "w";
} // }
else //else
{ // {
m1 = "rb"; // m1 = "rb";
m2 = "wb"; // m2 = "wb";
} // }
fd1 = _open_osfhandle(TO_INTPTR(hChildStdinWrDup), mode); fd1 = _open_osfhandle(TO_INTPTR(hChildStdinWrDup), mode);
//f1 = _fdopen(fd1, m2); //f1 = _fdopen(fd1, m2);
@ -401,25 +401,26 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
PERROR("CloseHandle"); PERROR("CloseHandle");
} }
file_count = 2;
break; break;
} }
case POPEN_3: case POPEN_3:
if ( 1) if ( 1)
{ {
char *m1, *m2; // Comment this out. Maybe we will need it in the future.
// file IO access to the process might be cool.
//char *m1, *m2;
if (mode && _O_TEXT) //if (mode && _O_TEXT)
{ // {
m1 = "r"; // m1 = "r";
m2 = "w"; // m2 = "w";
} // }
else //else
{ // {
m1 = "rb"; // m1 = "rb";
m2 = "wb"; // m2 = "wb";
} // }
fd1 = _open_osfhandle(TO_INTPTR(hChildStdinWrDup), mode); fd1 = _open_osfhandle(TO_INTPTR(hChildStdinWrDup), mode);
@ -430,7 +431,6 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
//f3 = _fdopen(fd3, m1); //f3 = _fdopen(fd3, m1);
PERROR("_open_osfhandle"); PERROR("_open_osfhandle");
file_count = 3;
break; break;
} }
} }
@ -556,11 +556,10 @@ bool cmWin32ProcessExecution::PrivateClose(int timeout)
std::string output = ""; std::string output = "";
bool done = false; bool done = false;
int stdoutloc = 0;
int stderrloc = 0;
while(!done) while(!done)
{ {
Sleep(10); Sleep(10);
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(this->m_pStdOut, &fsout);
@ -572,7 +571,6 @@ bool cmWin32ProcessExecution::PrivateClose(int timeout)
if (fserr.st_size > 0) if (fserr.st_size > 0)
{ {
//std::cout << "Some error" << std::endl; //std::cout << "Some error" << std::endl;
int dist = fserr.st_size;
char buffer[1023]; char buffer[1023];
int len = read(this->m_pStdErr, buffer, 1023); int len = read(this->m_pStdErr, buffer, 1023);
buffer[len] = 0; buffer[len] = 0;
@ -581,11 +579,11 @@ bool cmWin32ProcessExecution::PrivateClose(int timeout)
std::cout << buffer << std::flush; std::cout << buffer << std::flush;
} }
output += buffer; output += buffer;
have_some = true;
} }
if (fsout.st_size > 0) if (fsout.st_size > 0)
{ {
//std::cout << "Some output" << std::endl; //std::cout << "Some output" << std::endl;
int dist = fsout.st_size;
char buffer[1023]; char buffer[1023];
int len = read(this->m_pStdOut, buffer, 1023); int len = read(this->m_pStdOut, buffer, 1023);
buffer[len] = 0; buffer[len] = 0;
@ -594,8 +592,11 @@ bool cmWin32ProcessExecution::PrivateClose(int timeout)
std::cout << buffer << std::flush; std::cout << buffer << std::flush;
} }
output += buffer; output += buffer;
have_some = true;
} }
unsigned long exitCode; unsigned long exitCode;
if ( ! have_some )
{
GetExitCodeProcess(hProcess,&exitCode); GetExitCodeProcess(hProcess,&exitCode);
if (exitCode != STILL_ACTIVE) if (exitCode != STILL_ACTIVE)
{ {
@ -604,6 +605,7 @@ bool cmWin32ProcessExecution::PrivateClose(int timeout)
break; break;
} }
} }
}
//std::cout << "Waiting for process to close" << std::endl; //std::cout << "Waiting for process to close" << std::endl;