ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: expand arguments of services when they start"

Browse source
This commit is contained in:
Tom Cherry 2016-06-08 22:42:11 +00:00 • committed by Gerrit Code Review
commit 86cd314af3
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
init/service.cpp
View file

@ -495,13 +495,21 @@ bool Service::Start() {
} }
} }
std::vector<std::string> expanded_args;
std::vector<char*> strs; std::vector<char*> strs;
for (const auto& s : args_) { expanded_args.resize(args_.size());
strs.push_back(const_cast<char*>(s.c_str())); strs.push_back(const_cast<char*>(args_[0].c_str()));
for (std::size_t i = 1; i < args_.size(); ++i) {
if (!expand_props(args_[i], &expanded_args[i])) {
ERROR("%s: cannot expand '%s'\n", args_[0].c_str(), args_[i].c_str());
_exit(127);
}
strs.push_back(const_cast<char*>(expanded_args[i].c_str()));
} }
strs.push_back(nullptr); strs.push_back(nullptr);
if (execve(args_[0].c_str(), (char**) &strs[0], (char**) ENV) < 0) {
ERROR("cannot execve('%s'): %s\n", args_[0].c_str(), strerror(errno)); if (execve(strs[0], (char**) &strs[0], (char**) ENV) < 0) {
ERROR("cannot execve('%s'): %s\n", strs[0], strerror(errno));
} }
_exit(127); _exit(127);