6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-26 12:20:42 +00:00
Code Issues Projects Releases Wiki Activity

Simplify remove, create_directory and create_directories.

Browse Source 
Before this patch they would take an boolean argument to say if the path
already existed. This was redundant with the returned error_code which is able
to represent that. This allowed for callers to incorrectly check only the
existed flag instead of first checking the error code.

Instead, pass in a boolean flag to say if the previous (non-)existence should be
an error or not.

Callers of the of the old simple versions are not affected. They still ignore
the previous (non-)existence as they did before.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201979 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-02-23 13:56:14 +00:00
parent e4e42f7ff8
commit 589d637725
6 changed files with 74 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Support/Unix/Path.inc
+11 -17
View File
@@ -164,12 +164,11 @@ retry_random_path:
}
case FS_Dir: {
bool Existed;
error_code EC = sys::fs::create_directory(ResultPath.begin(), Existed);
if (EC)
if (error_code EC = sys::fs::create_directory(ResultPath.begin(), false)) {
if (EC == errc::file_exists)
goto retry_random_path;
return EC;
if (Existed)
goto retry_random_path;
}
return error_code::success();
}
}
@@ -333,16 +332,14 @@ error_code current_path(SmallVectorImpl<char> &result) {
return error_code::success();
}
error_code create_directory(const Twine &path, bool &existed) {
error_code create_directory(const Twine &path, bool IgnoreExisting) {
SmallString<128> path_storage;
StringRef p = path.toNullTerminatedStringRef(path_storage);
if (::mkdir(p.begin(), S_IRWXU | S_IRWXG) == -1) {
if (errno != errc::file_exists)
if (errno != errc::file_exists || !IgnoreExisting)
return error_code(errno, system_category());
existed = true;
} else
existed = false;
}
return error_code::success();
}
@@ -360,15 +357,14 @@ error_code create_hard_link(const Twine &to, const Twine &from) {
return error_code::success();
}
error_code remove(const Twine &path, bool &existed) {
error_code remove(const Twine &path, bool IgnoreNonExisting) {
SmallString<128> path_storage;
StringRef p = path.toNullTerminatedStringRef(path_storage);
struct stat buf;
if (stat(p.begin(), &buf) != 0) {
if (errno != errc::no_such_file_or_directory)
if (errno != errc::no_such_file_or_directory || !IgnoreNonExisting)
return error_code(errno, system_category());
existed = false;
return error_code::success();
}
@@ -381,11 +377,9 @@ error_code remove(const Twine &path, bool &existed) {
return make_error_code(errc::operation_not_permitted);
if (::remove(p.begin()) == -1) {
if (errno != errc::no_such_file_or_directory)
if (errno != errc::no_such_file_or_directory || !IgnoreNonExisting)
return error_code(errno, system_category());
existed = false;
} else
existed = true;
}
return error_code::success();
}