summaryrefslogtreecommitdiff
path: root/init/builtins.cpp
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2018-02-13 16:50:08 -0800
committerTom Cherry <tomcherry@google.com>2018-02-28 10:45:45 -0800
commitde6bd50d4238d19ec401127bcf2321dc679d908d (patch)
treef181f4acfa59f642c5927fc706060b192a2638e6 /init/builtins.cpp
parent304dacae8acd6c3469a7c5ff05357478ad2ff074 (diff)
init: add host side parser for init
Create a host side parser for init such that init rc files can be verified for syntax correctness before being used on the device. Bug: 36970783 Test: run the parser on init files on host Change-Id: I7e8772e278ebaff727057308596ebacf28b6fdda
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r--init/builtins.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 1040b47b0..51c2c9bd1 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -968,8 +968,8 @@ static Result<Success> do_wait_for_prop(const BuiltinArguments& args) {
const char* value = args[2].c_str();
size_t value_len = strlen(value);
- if (!is_legal_property_name(name)) {
- return Error() << "is_legal_property_name(" << name << ") failed";
+ if (!IsLegalPropertyName(name)) {
+ return Error() << "IsLegalPropertyName(" << name << ") failed";
}
if (value_len >= PROP_VALUE_MAX) {
return Error() << "value too long";
@@ -1018,6 +1018,7 @@ static Result<Success> do_init_user0(const BuiltinArguments& args) {
{"exec", "/system/bin/vdc", "--wait", "cryptfs", "init_user0"});
}
+// Builtin-function-map start
const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
constexpr std::size_t kMax = std::numeric_limits<std::size_t>::max();
// clang-format off
@@ -1075,6 +1076,7 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
// clang-format on
return builtin_functions;
}
+// Builtin-function-map end
} // namespace init
} // namespace android