!104 【master】输入目录增加校验

Merge pull request !104 from fyz1019/master
This commit is contained in:
openharmony_ci
2023-05-27 11:08:17 +00:00
committed by Gitee
+9 -3
View File
@@ -114,16 +114,22 @@ const string &PackageParser::GetDependEntry() const
uint32_t PackageParser::AddInput(const string& argValue)
{
auto ret = find_if(inputs_.begin(), inputs_.end(), [argValue](auto iter) {return argValue == iter;});
string inputPath = ResourceUtil::RealPath(argValue);
if (inputPath.empty()) {
cerr << "Error: invalid input '" << argValue << "'" << endl;
return RESTOOL_ERROR;
}
auto ret = find_if(inputs_.begin(), inputs_.end(), [inputPath](auto iter) {return inputPath == iter;});
if (ret != inputs_.end()) {
cerr << "Error: repeat input '" << argValue << "'" << endl;
return RESTOOL_ERROR;
}
if (!IsAscii(argValue)) {
if (!IsAscii(inputPath)) {
return RESTOOL_ERROR;
}
inputs_.push_back(argValue);
inputs_.push_back(inputPath);
return RESTOOL_SUCCESS;
}