RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Support/PathV2: Move current_path from path to fs and fix the Unix implementation.

Browse Source 
Unix bug spotted by Dan Gohman.

llvm-svn: 121090
This commit is contained in:
Michael J. Spencer 2010-12-07 01:22:31 +00:00
parent f909f96f2b
commit 898af0f235
5 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Support/FileSystem.h
View File

@ -148,6 +148,13 @@ error_code create_hard_link(const Twine &to, const Twine &from);
/// otherwise a platform specific error_code.
error_code create_symlink(const Twine &to, const Twine &from);
/// @brief Get the current path.
///
/// @param result Holds the current path on return.
/// @results errc::success if the current path has been stored in result,
/// otherwise a platform specific error_code.
error_code current_path(SmallVectorImpl<char> &result);
/// @brief Remove path. Equivalent to POSIX remove().
///
/// @param path Input path.

9
include/llvm/Support/PathV2.h
View File

@ -202,15 +202,6 @@ error_code native(const Twine &path, SmallVectorImpl<char> &result);
/// @name Lexical Observers
/// @{
/// @brief Get the current path.
///
/// @param result Holds the current path on return.
/// @results errc::success if the current path has been stored in result,
/// otherwise a platform specific error_code.
error_code current_path(SmallVectorImpl<char> &result);
// The following are purely lexical.
/// @brief Get root name.
///
/// //net/hello => //net

2
lib/Support/PathV2.cpp
View File

@ -437,7 +437,7 @@ error_code make_absolute(SmallVectorImpl<char> &path) {
// All of the following conditions will need the current directory.
SmallString<128> current_dir;
if (error_code ec = current_path(current_dir)) return ec;
if (error_code ec = fs::current_path(current_dir)) return ec;
// Relative path. Prepend the current directory.
if (!rootName && !rootDirectory) {

20
lib/Support/Unix/PathV2.inc
View File

@ -69,24 +69,26 @@ namespace {
namespace llvm {
namespace sys {
namespace path {
namespace fs {
error_code current_path(SmallVectorImpl<char> &result) {
long size = ::pathconf(".", _PC_PATH_MAX);
result.reserve(size + 1);
result.set_size(size + 1);
result.reserve(MAXPATHLEN);
if (::getcwd(result.data(), result.size()) == 0)
while (true) {
if (::getcwd(result.data(), result.capacity()) == 0) {
// See if there was a real error.
if (errno != errc::not_enough_memory)
return error_code(errno, system_category());
// Otherwise there just wasn't enough space.
result.reserve(result.capacity() * 2);
} else
break;
}
result.set_size(strlen(result.data()));
return success;
}
} // end namespace path
namespace fs{
error_code copy_file(const Twine &from, const Twine &to, copy_option copt) {
// Get arguments.
SmallString<128> from_storage;

6
lib/Support/Windows/PathV2.inc
View File

@ -134,7 +134,7 @@ namespace {
namespace llvm {
namespace sys {
namespace path {
namespace fs {
error_code current_path(SmallVectorImpl<char> &result) {
SmallVector<wchar_t, 128> cur_path;
@ -180,10 +180,6 @@ retry_cur_dir:
return success;
}
} // end namespace path
namespace fs {
error_code copy_file(const Twine &from, const Twine &to, copy_option copt) {
// Get arguments.
SmallString<128> from_storage;