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

It is late and it at least seems to work better than before...

This commit is contained in:
Andy Cedilnik 2002-09-29 21:57:48 -04:00
parent 375c695ba1
commit aad36568ea
1 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Source/cmSystemTools.cxx
View File

@ -265,7 +265,7 @@ bool cmSystemTools::ReadRegistryValue(const char *key, std::string &value)
HKEY hKey; HKEY hKey;
if(RegOpenKeyEx(primaryKey, if(RegOpenKeyEx(primaryKey,
second.c_str(), second.c_str(),
0, 0,
KEY_READ, KEY_READ,
&hKey) != ERROR_SUCCESS) &hKey) != ERROR_SUCCESS)
{ {
@ -438,7 +438,7 @@ bool cmSystemTools::DeleteRegistryValue(const char *key)
HKEY hKey; HKEY hKey;
if(RegOpenKeyEx(primaryKey, if(RegOpenKeyEx(primaryKey,
second.c_str(), second.c_str(),
0, 0,
KEY_WRITE, KEY_WRITE,
&hKey) != ERROR_SUCCESS) &hKey) != ERROR_SUCCESS)
{ {
@ -682,7 +682,7 @@ std::string cmSystemTools::ConvertToUnixOutputPath(const char* path)
char lastch = 1; char lastch = 1;
for(const char* ch = ret.c_str(); *ch != '\0'; ++ch) for(const char* ch = ret.c_str(); *ch != '\0'; ++ch)
{ {
// if it is already escaped then don't try to escape it again // if it is already escaped then don't try to escape it again
if(*ch == ' ' && lastch != '\\') if(*ch == ' ' && lastch != '\\')
{ {
result += '\\'; result += '\\';
@ -790,7 +790,7 @@ bool cmSystemTools::ParseFunction(std::ifstream& fin,
std::string& name, std::string& name,
std::vector<std::string>& arguments, std::vector<std::string>& arguments,
const char* filename, const char* filename,
bool& parseError) bool& parseError)
{ {
parseError = false; parseError = false;
name = ""; name = "";
@ -855,13 +855,13 @@ bool cmSystemTools::ParseFunction(std::ifstream& fin,
cmSystemTools::GetArguments(line, arguments); cmSystemTools::GetArguments(line, arguments);
} }
} }
else else
{ {
parseError = true; parseError = true;
cmSystemTools::Error("Parse error in read function missing end )\nIn File: ", cmSystemTools::Error("Parse error in read function missing end )\nIn File: ",
filename, "\nCurrent line:", inbuffer); filename, "\nCurrent line:", inbuffer);
return false; return false;
} }
} }
return true; return true;
} }
@ -1248,7 +1248,7 @@ bool cmSystemTools::IsOff(const char* val)
*c = toupper(*c); *c = toupper(*c);
} }
return (v == "OFF" || v == "0" || v == "NO" || v == "FALSE" || return (v == "OFF" || v == "0" || v == "NO" || v == "FALSE" ||
v == "N" || v == "NOTFOUND" || v == "IGNORE"); v == "N" || v == "NOTFOUND" || v == "IGNORE");
} }
@ -1326,9 +1326,9 @@ bool WindowsRunCommand(const char* command, const char* dir,
std::string& output, int& retVal, bool verbose) std::string& output, int& retVal, bool verbose)
{ {
//verbose = true; //verbose = true;
std::cerr << std::endl //std::cerr << std::endl
<< "WindowsRunCommand(" << command << ")" << std::endl // << "WindowsRunCommand(" << command << ")" << std::endl
<< std::flush; // << std::flush;
const int BUFFER_SIZE = 4096; const int BUFFER_SIZE = 4096;
char buf[BUFFER_SIZE]; char buf[BUFFER_SIZE];
@ -1430,11 +1430,11 @@ bool WindowsRunCommand(const char* command, const char* dir,
{ {
while (bread >= 1023) while (bread >= 1023)
{ {
//std::cout << "Read data..." << std::endl; //std::cout << "Read data..." << std::endl;
ReadFile(read_stdout,buf,1023,&bread,NULL); ReadFile(read_stdout,buf,1023,&bread,NULL);
//read the stdout pipe //read the stdout pipe
printf("%s",buf); std::cout << buf << std::flush;
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
} }
@ -1447,8 +1447,7 @@ bool WindowsRunCommand(const char* command, const char* dir,
output += "\n"; output += "\n";
if(verbose) if(verbose)
{ {
std::cerr << verbose << " [{" << buf << "}]" std::cout << buf << std::flush;
<< std::endl << std::flush;
} }
@ -1474,11 +1473,14 @@ bool WindowsRunCommand(const char* command, const char* dir,
#include "cmWin32ProcessExecution.h" #include "cmWin32ProcessExecution.h"
// use this for shell commands like echo and dir // use this for shell commands like echo and dir
bool RunCommandViaWin32(const char* command, bool RunCommandViaWin32(const char* command,
const char* dir, const char* dir,
std::string& output, std::string& output,
int& retVal, int& retVal,
bool verbose) bool verbose)
{ {
#if defined(__BORLANDC__)
return ::WindowsRunCommand(command, dir, output, retVal, verbose);
#else // Visual studio
::SetLastError(ERROR_SUCCESS); ::SetLastError(ERROR_SUCCESS);
if ( ! command ) if ( ! command )
{ {
@ -1505,6 +1507,7 @@ bool RunCommandViaWin32(const char* command,
output = resProc.GetOutput(); output = resProc.GetOutput();
retVal = resProc.GetExitValue(); retVal = resProc.GetExitValue();
return true; return true;
#endif
} }
// use this for shell commands like echo and dir // use this for shell commands like echo and dir
@ -1630,9 +1633,9 @@ bool cmSystemTools::RunCommand(const char* command,
//return RunCommandViaSystem(shortCmd.c_str(), dir, //return RunCommandViaSystem(shortCmd.c_str(), dir,
// output, retVal, verbose); // output, retVal, verbose);
//return WindowsRunCommand(shortCmd.c_str(), dir, //return WindowsRunCommand(shortCmd.c_str(), dir,
//output, retVal, verbose); //output, retVal, verbose);
return RunCommandViaWin32(shortCmd.c_str(), dir, return RunCommandViaWin32(shortCmd.c_str(), dir,
output, retVal, verbose); output, retVal, verbose);
} }
else else
{ {
@ -1700,27 +1703,27 @@ bool cmSystemTools::RunCommand(const char* command,
{ {
#ifdef SIGKILL #ifdef SIGKILL
case SIGKILL: case SIGKILL:
error << "SIGKILL"; error << "SIGKILL";
break; break;
#endif #endif
#ifdef SIGFPE #ifdef SIGFPE
case SIGFPE: case SIGFPE:
error << "SIGFPE"; error << "SIGFPE";
break; break;
#endif #endif
#ifdef SIGBUS #ifdef SIGBUS
case SIGBUS: case SIGBUS:
error << "SIGBUS"; error << "SIGBUS";
break; break;
#endif #endif
#ifdef SIGSEGV #ifdef SIGSEGV
case SIGSEGV: case SIGSEGV:
error << "SIGSEGV"; error << "SIGSEGV";
break; break;
#endif #endif
default: default:
error << "signal " << retVal; error << "signal " << retVal;
break; break;
} }
output += error.str(); output += error.str();
} }
@ -1734,7 +1737,7 @@ bool cmSystemTools::RunCommand(const char* command,
* found. Otherwise, the empty string is returned. * found. Otherwise, the empty string is returned.
*/ */
std::string cmSystemTools::FindFile(const char* name, std::string cmSystemTools::FindFile(const char* name,
const std::vector<std::string>& userPaths) const std::vector<std::string>& userPaths)
{ {
// Add the system search path to our path. // Add the system search path to our path.
std::vector<std::string> path = userPaths; std::vector<std::string> path = userPaths;
@ -1763,7 +1766,7 @@ std::string cmSystemTools::FindFile(const char* name,
* found. Otherwise, the empty string is returned. * found. Otherwise, the empty string is returned.
*/ */
std::string cmSystemTools::FindProgram(const char* name, std::string cmSystemTools::FindProgram(const char* name,
const std::vector<std::string>& userPaths, const std::vector<std::string>& userPaths,
bool no_system_path) bool no_system_path)
{ {
// See if the executable exists as written. // See if the executable exists as written.
@ -1998,8 +2001,8 @@ std::string cmSystemTools::GetProgramPath(const char* in_name)
* string is returned. * string is returned.
*/ */
void cmSystemTools::SplitProgramPath(const char* in_name, void cmSystemTools::SplitProgramPath(const char* in_name,
std::string& dir, std::string& dir,
std::string& file) std::string& file)
{ {
dir = in_name; dir = in_name;
file = ""; file = "";
@ -2221,7 +2224,7 @@ void cmSystemTools::Glob(const char *directory, const char *regexp,
if (d.Load(directory)) if (d.Load(directory))
{ {
size_t numf; size_t numf;
unsigned int i; unsigned int i;
numf = d.GetNumberOfFiles(); numf = d.GetNumberOfFiles();
for (i = 0; i < numf; i++) for (i = 0; i < numf; i++)
{ {