summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/System/Win32/Path.inc13
-rw-r--r--lib/System/Win32/Program.inc6
-rw-r--r--lib/System/Win32/Signals.inc4
3 files changed, 10 insertions, 13 deletions
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index fb6351695df..9e7010a4390 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -99,11 +99,11 @@ Path::GetTemporaryDirectory() {
// Append a subdirectory passed on our process id so multiple LLVMs don't
// step on each other's toes.
sprintf(pathname, "LLVM_%u", GetCurrentProcessId());
- result.appendDirectory(pathname);
+ result.appendComponent(pathname);
// If there's a directory left over from a previous LLVM execution that
// happened to have the same process id, get rid of it.
- result.destroyDirectory(true);
+ result.destroy(true);
// And finally (re-)create the empty directory.
result.createDirectory(false);
@@ -195,10 +195,7 @@ Path::GetUserHomeDirectory() {
bool
Path::isFile() const {
- WIN32_FILE_ATTRIBUTE_DATA fi;
- if (!GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi))
- ThrowError(std::string(path) + ": Can't get status: ");
- return fi.dwFileAttributes & FILE_ATTRIBUTE_NORMAL;
+ return !isDirectory();
}
bool
@@ -395,7 +392,7 @@ Path::set(const std::string& a_path) {
}
bool
-Path::appendComponent(const std::string& dir) {
+Path::appendComponent(const std::string& name) {
if (name.empty())
return false;
std::string save(path);
@@ -528,7 +525,7 @@ Path::destroy(bool remove_contents) const {
if (!DeleteFile(path.c_str()))
ThrowError(path + ": Can't destroy file: ");
return true;
- } else if (isDirectory()) {
+ } else /* isDirectory() */ {
// If it doesn't exist, we're done.
if (!exists())
diff --git a/lib/System/Win32/Program.inc b/lib/System/Win32/Program.inc
index 6519ca50690..95f56b231f1 100644
--- a/lib/System/Win32/Program.inc
+++ b/lib/System/Win32/Program.inc
@@ -31,9 +31,9 @@ Program::FindProgramByName(const std::string& progName) {
if (progName.length() == 0) // no program
return Path();
Path temp;
- if (!temp.setFile(progName)) // invalid name
+ if (!temp.set(progName)) // invalid name
return Path();
- if (temp.executable()) // already executable as is
+ if (temp.canExecute()) // already executable as is
return temp;
// At this point, the file name is valid and its not executable.
@@ -101,7 +101,7 @@ Program::ExecuteAndWait(const Path& path,
const char** envp,
const Path** redirects,
unsigned secondsToWait) {
- if (!path.executable())
+ if (!path.canExecute())
throw path.toString() + " is not executable";
// Windows wants a command line, not an array of args, to pass to the new
diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc
index 2d35628edc3..4ac768eff9a 100644
--- a/lib/System/Win32/Signals.inc
+++ b/lib/System/Win32/Signals.inc
@@ -123,7 +123,7 @@ static void Cleanup() {
if (FilesToRemove != NULL)
while (!FilesToRemove->empty()) {
try {
- FilesToRemove->back().destroyFile();
+ FilesToRemove->back().destroy();
} catch (...) {
}
FilesToRemove->pop_back();
@@ -132,7 +132,7 @@ static void Cleanup() {
if (DirectoriesToRemove != NULL)
while (!DirectoriesToRemove->empty()) {
try {
- DirectoriesToRemove->back().destroyDirectory(true);
+ DirectoriesToRemove->back().destroy(true);
} catch (...) {
}
DirectoriesToRemove->pop_back();