openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am c3c03f12: am 28e52c81: am b35f68a6: Merge "init: load factory properties" 

* commit 'c3c03f12ad5397588af639178ad200b56787790a':
  init: load factory properties
This commit is contained in:
Dima Zavin 2013-08-28 14:48:10 -07:00 committed by Android Git Automerger
parent 61d1b4420c c3c03f12ad
commit f8f64988dd
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
init/property_service.c
View File

@ -404,10 +404,13 @@ void get_property_workspace(int *fd, int *sz)
*sz = pa_workspace.size;
}
static void load_properties(char *data)
static void load_properties(char *data, char *prefix)
{
char *key, *value, *eol, *sol, *tmp;
size_t plen;
if (prefix)
plen = strlen(prefix);
sol = data;
while((eol = strchr(sol, '\n'))) {
key = sol;
@ -423,6 +426,9 @@ static void load_properties(char *data)
tmp = value - 2;
while((tmp > key) && isspace(*tmp)) *tmp-- = 0;
if (prefix && strncmp(key, prefix, plen))
continue;
while(isspace(*value)) value++;
tmp = eol - 2;
while((tmp > value) && isspace(*tmp)) *tmp-- = 0;
@ -431,7 +437,7 @@ static void load_properties(char *data)
}
}
static void load_properties_from_file(const char *fn)
static void load_properties_from_file(const char *fn, char *prefix)
{
char *data;
unsigned sz;
@ -439,7 +445,7 @@ static void load_properties_from_file(const char *fn)
data = read_file(fn, &sz);
if(data != 0) {
load_properties(data);
load_properties(data, prefix);
free(data);
}
}
@ -512,7 +518,7 @@ void property_init(void)
void property_load_boot_defaults(void)
{
load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT);
load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT, NULL);
}
int properties_inited(void)
@ -527,7 +533,7 @@ static void load_override_properties() {
ret = property_get("ro.debuggable", debuggable);
if (ret && (strcmp(debuggable, "1") == 0)) {
load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE, NULL);
}
#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
}
@ -549,8 +555,9 @@ void start_property_service(void)
{
int fd;
load_properties_from_file(PROP_PATH_SYSTEM_BUILD);
load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT);
load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);
load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT, NULL);
load_properties_from_file(PROP_PATH_FACTORY, "ro.");
load_override_properties();
/* Read persistent properties after all default values have been loaded. */
load_persistent_properties();