commit 6310a8261c922533a692fb3e74ece2da98d4bafa
author Colin Cross <ccross@android.com> Tue Apr 20 14:29:05 2010 -0700
committer Colin Cross <ccross@android.com> Wed Apr 21 19:43:40 2010 -0700
tree 32a27ed5e629bdc77f2a9d92644b010bf0bef5c8
parent 3294bbbad9494eb4ca534624b96e39f8ed15aaf2

init: Split parser into generic parser and init parser

Change-Id: I451ebc4ff12f2ac660eb533fa10ad561fa25c9dd

init/init.c

diff --git a/init/init.c b/init/init.c
index 3471cf8..50f8f45 100755
--- a/init/init.c
+++ b/init/init.c
@@ -46,7 +46,7 @@
 #include "bootchart.h"
 #include "signal_handler.h"
 #include "keychords.h"
-#include "parser.h"
+#include "init_parser.h"
 #include "util.h"
 
 static int property_triggers_enabled = 0;
@@ -253,7 +253,7 @@
                 ERROR("cannot execve('%s'): %s\n", svc->args[0], strerror(errno));
             }
         } else {
-            char *arg_ptrs[SVC_MAXARGS+1];
+            char *arg_ptrs[INIT_PARSER_MAXARGS+1];
             int arg_idx = svc->nargs;
             char *tmp = strdup(dynamic_args);
             char *next = tmp;
@@ -264,7 +264,7 @@
 
             while((bword = strsep(&next, " "))) {
                 arg_ptrs[arg_idx++] = bword;
-                if (arg_idx == SVC_MAXARGS)
+                if (arg_idx == INIT_PARSER_MAXARGS)
                     break;
             }
             arg_ptrs[arg_idx] = '\0';
@@ -748,7 +748,7 @@
     log_init();
     
     INFO("reading config file\n");
-    parse_config_file("/init.rc");
+    init_parse_config_file("/init.rc");
 
     /* pull the kernel commandline and ramdisk properties file in */
     qemu_init();
@@ -756,7 +756,7 @@
 
     get_hardware_name();
     snprintf(tmp, sizeof(tmp), "/init.%s.rc", hardware);
-    parse_config_file(tmp);
+    init_parse_config_file(tmp);
 
     action_for_each_trigger("early-init", action_add_queue_tail);