openharmony/developtools_global_resource_tool
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_global_resource_tool.git synced 2026-07-19 19:33:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

输入目录增加校验

Browse Source 
Signed-off-by: fangyunzhong <fangyunzhong2@huawei.com>
This commit is contained in:
fangyunzhong
2023-05-27 08:16:38 +00:00
parent 6c6127a79e
commit f24c694b0c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd_parser.cpp
+9 -3
View File
@@ -114,16 +114,22 @@ const string &PackageParser::GetDependEntry() const
uint32_t PackageParser::AddInput(const string& argValue) 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()) { if (ret != inputs_.end()) {
cerr << "Error: repeat input '" << argValue << "'" << endl; cerr << "Error: repeat input '" << argValue << "'" << endl;
return RESTOOL_ERROR; return RESTOOL_ERROR;
} }
if (!IsAscii(argValue)) { if (!IsAscii(inputPath)) {
return RESTOOL_ERROR; return RESTOOL_ERROR;
} }
inputs_.push_back(argValue); inputs_.push_back(inputPath);
return RESTOOL_SUCCESS; return RESTOOL_SUCCESS;
} }