openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Support importing property file with expanded name"

This commit is contained in:
Treehugger Robot 2019-06-13 23:40:48 +00:00 committed by Gerrit Code Review
parent bc420c4748 a87c0f99ad
commit 69880e1a39
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
init/property_service.cpp
View File

@ -645,8 +645,14 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
while (isspace(*key)) key++;
}
load_properties_from_file(fn, key, properties);
std::string raw_filename(fn);
std::string expanded_filename;
if (!expand_props(raw_filename, &expanded_filename)) {
LOG(ERROR) << "Could not expand filename '" << raw_filename << "'";
continue;
}
load_properties_from_file(expanded_filename.c_str(), key, properties);
} else {
value = strchr(key, '=');
if (!value) continue;