cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3015 from Getline-Network/develop

Browse Source 
Allow trailing slash in solc -allow-paths.
This commit is contained in:
Alex Beregszaszi 2017-10-06 14:23:22 +01:00 committed by GitHub
commit 6c09e32c3f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
solc/CommandLineInterface.cpp
View File

@ -716,8 +716,17 @@ bool CommandLineInterface::processInput()
if (m_args.count(g_argAllowPaths)) if (m_args.count(g_argAllowPaths))
{ {
vector<string> paths; vector<string> paths;
for (string const& path: boost::split(paths, m_args[g_argAllowPaths].as<string>(), boost::is_any_of(","))) for (string const& path: boost::split(paths, m_args[g_argAllowPaths].as<string>(), boost::is_any_of(","))) {
m_allowedDirectories.push_back(boost::filesystem::path(path)); auto filesystem_path = boost::filesystem::path(path);
// If the given path had a trailing slash, the Boost filesystem
// path will have it's last component set to '.'. This breaks
// path comparison in later parts of the code, so we need to strip
// it.
if (filesystem_path.filename() == ".") {
filesystem_path.remove_filename();
}
m_allowedDirectories.push_back(filesystem_path);
}
} }
if (m_args.count(g_argStandardJSON)) if (m_args.count(g_argStandardJSON))