nicole/cellar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

cellar translate will now use resolve_drive_letter

Browse Source
This commit is contained in:
Nicholas O'Connor 2019-05-15 18:09:22 -07:00
parent b305cf56f4
commit 85cec3444c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/paths.cpp
View File

@ -27,19 +27,22 @@ string cellar::paths::translate(std::string in_path, bool lazy) {
}
if (windows_input) {
// lazy
if (boost::algorithm::to_lower_copy(in_path.substr(0,1)) != "z") {
throw invalid_argument("lazy path translation isn't possible for drive letters other than Z:");
}
string out_path = in_path.substr(2, in_path.size() - 2);
if (lazy) {
if (boost::algorithm::to_lower_copy(in_path.substr(0,1)) != "z") {
throw invalid_argument("lazy path translation isn't possible for drive letters other than Z:");
}
string out_path = in_path.substr(2, in_path.size() - 2);
size_t slashpos = out_path.find("\\");
while (slashpos != std::string::npos) {
out_path.replace(slashpos, 1, "/");
slashpos = out_path.find("\\");
}
size_t slashpos = out_path.find("\\");
while (slashpos != std::string::npos) {
out_path.replace(slashpos, 1, "/");
slashpos = out_path.find("\\");
}
return out_path;
return out_path;
} else {
return paths::resolve_drive_letter(in_path);
}
} else {
// lazy
string out_path = "Z:";