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 8a502000: Merge "init: expand_props for onrestart commands." 

* commit '8a502000d15cce102569d3609e24846ef19a4a77':
  init: expand_props for onrestart commands.
This commit is contained in:
Yabin Cui 2015-07-25 02:01:32 +00:00 committed by Android Git Automerger
parent bd5f10addf 8a502000d1
commit 10821da322
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
init/init.cpp
View File

@ -585,6 +585,19 @@ std::string build_triggers_string(struct action *cur_action) {
return result;
}
bool expand_command_arguments(int nargs, char** args, std::vector<std::string>* expanded_args) {
std::vector<std::string>& strs = *expanded_args;
strs.resize(nargs);
strs[0] = args[0];
for (int i = 1; i < nargs; ++i) {
if (expand_props(args[i], &strs[i]) == -1) {
ERROR("%s: cannot expand '%s'\n", args[0], args[i]);
return false;
}
}
return true;
}
void execute_one_command() {
Timer t;
@ -606,14 +619,9 @@ void execute_one_command() {
return;
}
int result = 0;
std::vector<std::string> arg_strs(cur_command->nargs);
arg_strs[0] = cur_command->args[0];
for (int i = 1; i < cur_command->nargs; ++i) {
if (expand_props(cur_command->args[i], &arg_strs[i]) == -1) {
ERROR("%s: cannot expand '%s'\n", cur_command->args[0], cur_command->args[i]);
result = -EINVAL;
break;
}
std::vector<std::string> arg_strs;
if (!expand_command_arguments(cur_command->nargs, cur_command->args, &arg_strs)) {
result = -EINVAL;
}
if (result == 0) {
std::vector<char*> args;

1
init/init.h
View File

@ -161,5 +161,6 @@ int selinux_reload_policy(void);
void zap_stdio(void);
void register_epoll_handler(int fd, void (*fn)());
bool expand_command_arguments(int nargs, char** args, std::vector<std::string>* expanded_args);
#endif /* _INIT_INIT_H */

9
init/signal_handler.cpp
View File

@ -136,7 +136,14 @@ static bool wait_for_one_process() {
struct listnode* node;
list_for_each(node, &svc->onrestart.commands) {
command* cmd = node_to_item(node, struct command, clist);
cmd->func(cmd->nargs, cmd->args);
std::vector<std::string> arg_strs;
if (expand_command_arguments(cmd->nargs, cmd->args, &arg_strs)) {
std::vector<char*> args;
for (auto& s : arg_strs) {
args.push_back(&s[0]);
}
cmd->func(args.size(), &args[0]);
}
}
svc->NotifyStateChange("restarting");
return true;