Skip to content

Commit

Permalink
[Support] Add sys::fs::set_current_path() (aka chdir)
Browse files Browse the repository at this point in the history
Summary:
This adds a cross-platform way of setting the current working directory
analogous to the existing current_path() function used for retrieving
it. The function will be used in lldb.

Reviewers: rafael, silvas, zturner

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D29035

llvm-svn: 292907
  • Loading branch information
labath committed Jan 24, 2017
1 parent 5aeb880 commit 2f09609
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 0 deletions.
7 changes: 7 additions & 0 deletions llvm/include/llvm/Support/FileSystem.h
Expand Up @@ -357,6 +357,13 @@ std::error_code create_hard_link(const Twine &to, const Twine &from);
/// otherwise a platform-specific error_code.
std::error_code current_path(SmallVectorImpl<char> &result);

/// @brief Set the current path.
///
/// @param path The path to set.
/// @returns errc::success if the current path was successfully set,
/// otherwise a platform-specific error_code.
std::error_code set_current_path(const Twine &path);

/// @brief Remove path. Equivalent to POSIX remove().
///
/// @param path Input path.
Expand Down
10 changes: 10 additions & 0 deletions llvm/lib/Support/Unix/Path.inc
Expand Up @@ -257,6 +257,16 @@ std::error_code current_path(SmallVectorImpl<char> &result) {
return std::error_code();
}

std::error_code set_current_path(const Twine &path) {
SmallString<128> path_storage;
StringRef p = path.toNullTerminatedStringRef(path_storage);

if (::chdir(p.begin()) == -1)
return std::error_code(errno, std::generic_category());

return std::error_code();
}

std::error_code create_directory(const Twine &path, bool IgnoreExisting,
perms Perms) {
SmallString<128> path_storage;
Expand Down
12 changes: 12 additions & 0 deletions llvm/lib/Support/Windows/Path.inc
Expand Up @@ -200,6 +200,18 @@ std::error_code current_path(SmallVectorImpl<char> &result) {
return UTF16ToUTF8(cur_path.begin(), cur_path.size(), result);
}

std::error_code set_current_path(const Twine &path) {
// Convert to utf-16.
SmallVector<wchar_t, 128> wide_path;
if (std::error_code ec = widenPath(path, wide_path))
return ec;

if (!::SetCurrentDirectoryW(wide_path.begin()))
return mapWindowsError(::GetLastError());

return std::error_code();
}

std::error_code create_directory(const Twine &path, bool IgnoreExisting,
perms Perms) {
SmallVector<wchar_t, 128> path_utf16;
Expand Down
19 changes: 19 additions & 0 deletions llvm/unittests/Support/Path.cpp
Expand Up @@ -1135,4 +1135,23 @@ TEST_F(FileSystemTest, OpenFileForRead) {

::close(FileDescriptor);
}

TEST_F(FileSystemTest, set_current_path) {
SmallString<128> path;

ASSERT_NO_ERROR(fs::current_path(path));
ASSERT_NE(TestDirectory, path);

struct RestorePath {
SmallString<128> path;
RestorePath(const SmallString<128> &path) : path(path) {}
~RestorePath() { fs::set_current_path(path); }
} restore_path(path);

ASSERT_NO_ERROR(fs::set_current_path(TestDirectory));

ASSERT_NO_ERROR(fs::current_path(path));
ASSERT_EQ(TestDirectory, path);
}

} // anonymous namespace

0 comments on commit 2f09609

Please sign in to comment.