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

am 950c6250: am 5138958c: Merge "Enable property expansion for insmod" 

* commit '950c6250ad5c67700d4bffcaa0671b4c145fa563':
  Enable property expansion for insmod
This commit is contained in:
Elliott Hughes 2015-05-06 22:44:23 +00:00 committed by Android Git Automerger
parent 72afeebc73 950c6250ad
commit cf0a113811
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init/builtins.cpp
View File

@ -58,7 +58,16 @@ extern "C" int init_module(void *, unsigned long, const char *);
static int insmod(const char *filename, char *options)
{
std::string module;
if (!read_file(filename, &module)) {
char filename_val[PROP_VALUE_MAX];
int ret;
ret = expand_props(filename_val, filename, sizeof(filename_val));
if (ret) {
ERROR("insmod: cannot expand '%s'\n", filename);
return -EINVAL;
}
if (!read_file(filename_val, &module)) {
return -1;
}