[llvm-commits] [llvm] r120817 - in /llvm/trunk: lib/Support/Unix/PathV2.inc lib/Support/Windows/PathV2.inc unittests/Support/Path.cpp
Michael J. Spencer
bigcheesegs at gmail.com
Fri Dec 3 09:53:43 PST 2010
Author: mspencer
Date: Fri Dec 3 11:53:43 2010
New Revision: 120817
URL: http://llvm.org/viewvc/llvm-project?rev=120817&view=rev
Log:
Support/FileSystem: Add remove implementation.
Modified:
llvm/trunk/lib/Support/Unix/PathV2.inc
llvm/trunk/lib/Support/Windows/PathV2.inc
llvm/trunk/unittests/Support/Path.cpp
Modified: llvm/trunk/lib/Support/Unix/PathV2.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/PathV2.inc?rev=120817&r1=120816&r2=120817&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Unix/PathV2.inc (original)
+++ llvm/trunk/lib/Support/Unix/PathV2.inc Fri Dec 3 11:53:43 2010
@@ -186,6 +186,20 @@
return make_error_code(errc::success);
}
+error_code remove(const Twine &path, bool &existed) {
+ SmallString<128> path_storage;
+ StringRef p = path.toNullTerminatedStringRef(path_storage);
+
+ if (::remove(p.begin()) == -1) {
+ if (errno != ENOENT)
+ return error_code(errno, system_category());
+ existed = false;
+ } else
+ existed = true;
+
+ return make_error_code(errc::success);
+}
+
error_code exists(const Twine &path, bool &result) {
SmallString<128> path_storage;
StringRef p = path.toNullTerminatedStringRef(path_storage);
Modified: llvm/trunk/lib/Support/Windows/PathV2.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/PathV2.inc?rev=120817&r1=120816&r2=120817&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/PathV2.inc (original)
+++ llvm/trunk/lib/Support/Windows/PathV2.inc Fri Dec 3 11:53:43 2010
@@ -252,6 +252,25 @@
return make_error_code(errc::success);
}
+error_code remove(const Twine &path, bool &existed) {
+ SmallString<128> path_storage;
+ SmallVector<wchar_t, 128> path_utf16;
+
+ if (error_code ec = UTF8ToUTF16(path.toStringRef(path_storage),
+ path_utf16))
+ return ec;
+
+ if (!::DeleteFileW(path_utf16.begin())) {
+ error_code ec = make_error_code(windows_error(::GetLastError()));
+ if (ec != make_error_code(windows_error::file_not_found))
+ return ec;
+ existed = false;
+ } else
+ existed = true;
+
+ return make_error_code(errc::success);
+}
+
error_code exists(const Twine &path, bool &result) {
SmallString<128> path_storage;
SmallVector<wchar_t, 128> path_utf16;
Modified: llvm/trunk/unittests/Support/Path.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/Path.cpp?rev=120817&r1=120816&r2=120817&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/Path.cpp (original)
+++ llvm/trunk/unittests/Support/Path.cpp Fri Dec 3 11:53:43 2010
@@ -128,7 +128,8 @@
EXPECT_TRUE(TempFileExists);
::close(FileDescriptor);
- ::remove(TempPath.c_str());
+ ASSERT_FALSE(fs::remove(Twine(TempPath), TempFileExists));
+ EXPECT_TRUE(TempFileExists);
ASSERT_FALSE(fs::exists(Twine(TempPath), TempFileExists));
EXPECT_FALSE(TempFileExists);
More information about the llvm-commits
mailing list