commit cafe76d08f4882ccd04e896cc940e7f58c863d5e
author Tom Cherry <tomcherry@google.com> Wed Jun 08 22:42:11 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 08 22:42:11 2016 +0000
tree 6c83d471c64ab1ee73df5408d5b12cc62d745cbe
parent 86613acc4a7442500490045b8f74e236d7525a73
parent 16497ef1b897d8dabf4c86d8122619040d270dd4

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

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 4ea8936..6e68878 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -495,13 +495,21 @@
             }
         }
 
+        std::vector<std::string> expanded_args;
         std::vector<char*> strs;
-        for (const auto& s : args_) {
-            strs.push_back(const_cast<char*>(s.c_str()));
+        expanded_args.resize(args_.size());
+        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);
-        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);