loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix creating handles for junction link game paths

Browse Source
This commit is contained in:
Oliver Hamlet
2017-06-16 18:31:13 +01:00
parent 0d7c1fb966
commit c78314c313
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/api.cpp
+3 -1
View File
@@ -38,7 +38,9 @@ namespace fs = boost::filesystem;
namespace loot {
std::string ResolvePath(const std::string& path) {
if (path.empty() || !fs::is_symlink(path))
// NTFS junction links show up as symlinks and directories, but resolving
// them just appends their target path.
if (path.empty() || !fs::is_symlink(path) || fs::is_directory(path))
return path;
return fs::read_symlink(path).string();
src/tests/api/interface/create_game_handle_test.h
+20 -2
View File
@@ -37,14 +37,21 @@ class CreateGameHandleTest : public CommonGameTestFixture {
protected:
CreateGameHandleTest() :
handle_(nullptr),
gamePathSymlink(dataPath.parent_path().string() + "symlink"),
localPathSymlink(localPath.string() + "symlink") {}
gamePathSymlink(dataPath.parent_path().string() + ".symlink"),
localPathSymlink(localPath.string() + ".symlink"),
gamePathJunctionLink(dataPath.parent_path().string() + ".junction"),
localPathJunctionLink(localPath.string() + ".junction") {}
void SetUp() {
CommonGameTestFixture::SetUp();
boost::filesystem::create_directory_symlink(dataPath.parent_path(), gamePathSymlink);
boost::filesystem::create_directory_symlink(localPath, localPathSymlink);
#ifdef _WIN32
system(("mklink /J \"" + boost::filesystem::absolute(gamePathJunctionLink).string() + "\" \"" + boost::filesystem::absolute(dataPath).parent_path().string() + "\"").c_str());
system(("mklink /J \"" + boost::filesystem::absolute(localPathJunctionLink).string() + "\" \"" + boost::filesystem::absolute(localPath).string() + "\"").c_str());
#endif
}
void TearDown() {
@@ -52,12 +59,16 @@ protected:
boost::filesystem::remove(gamePathSymlink);
boost::filesystem::remove(localPathSymlink);
boost::filesystem::remove(gamePathJunctionLink);
boost::filesystem::remove(localPathJunctionLink);
}
std::shared_ptr<GameInterface> handle_;
const boost::filesystem::path gamePathSymlink;
const boost::filesystem::path localPathSymlink;
const boost::filesystem::path gamePathJunctionLink;
const boost::filesystem::path localPathJunctionLink;
};
// Pass an empty first argument, as it's a prefix for the test instantation,
@@ -104,6 +115,13 @@ TEST_P(CreateGameHandleTest, shouldReturnOkIfPassedGameAndLocalPathSymlinks) {
EXPECT_NO_THROW(handle_ = CreateGameHandle(GetParam(), gamePathSymlink.string(), localPathSymlink.string()));
EXPECT_NE(nullptr, handle_);
}
#ifdef _WIN32
TEST_P(CreateGameHandleTest, shouldReturnOkIfPassedGameAndLocalPathJunctionLinks) {
EXPECT_NO_THROW(handle_ = CreateGameHandle(GetParam(), gamePathJunctionLink.string(), localPathJunctionLink.string()));
EXPECT_NE(nullptr, handle_);
}
#endif
}
}