commit 00ede7d2626f9343d330dc6f5286bba3e99e41d0
author Yabin Cui <yabinc@google.com> Fri Jul 24 13:26:04 2015 -0700
committer Yabin Cui <yabinc@google.com> Fri Jul 24 15:02:19 2015 -0700
tree fdd8e8a7a67c962194f9b6b8a95a3c7324cf577a
parent 74edcea90e31a3795e58aa1b2bbe96032f0bcd61

init: do expand_props before calling the builtins.

Also switch expand_props to std::string.

Bug: 22654233

Change-Id: I62910d4f74e2b1a5bd2b14aea440767a2a8462b7

init/init_parser.h

diff --git a/init/init_parser.h b/init/init_parser.h
index 90f880f..fa7e67f 100644
--- a/init/init_parser.h
+++ b/init/init_parser.h
@@ -17,6 +17,8 @@
 #ifndef _INIT_INIT_PARSER_H_
 #define _INIT_INIT_PARSER_H_
 
+#include <string>
+
 #define INIT_PARSER_MAXARGS 64
 
 struct action;
@@ -32,7 +34,7 @@
 void queue_builtin_action(int (*func)(int nargs, char **args), const char *name);
 
 bool init_parse_config_file(const char* path);
-int expand_props(char *dst, const char *src, int len);
+int expand_props(const char *src, std::string *dst);
 
 service* make_exec_oneshot_service(int argc, char** argv);