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 b377955: init: Fix some broken code that did not cause problems until 

Merge commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672'

* commit 'b3779558dcfbe99f0b9c1ef796e3728edad25672':
  init: Fix some broken code that did not cause problems until switching to gcc 4.4
This commit is contained in:
Mike Lockwood 2009-05-08 11:36:11 -07:00 committed by The Android Open Source Project
parent 46f208e40d b3779558dc
commit 6e1683f5a7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/parser.c
View File

@ -536,7 +536,7 @@ void queue_all_property_triggers()
const char* name = act->name + strlen("property:");
const char* equals = strchr(name, '=');
if (equals) {
char* prop_name[PROP_NAME_MAX + 1];
char prop_name[PROP_NAME_MAX + 1];
const char* value;
int length = equals - name;
if (length > PROP_NAME_MAX) {
@ -546,7 +546,7 @@ void queue_all_property_triggers()
prop_name[length] = 0;
/* does the property exist, and match the trigger value? */
value = property_get((const char *)&prop_name[0]);
value = property_get(prop_name);
if (value && !strcmp(equals + 1, value)) {
action_add_queue_tail(act);
}

7
init/property_service.c
View File

@ -296,7 +296,7 @@ int property_set(const char *name, const char *value)
__futex_wake(&pa->serial, INT32_MAX);
}
/* If name starts with "net." treat as a DNS property. */
if (strncmp("net.", name, sizeof("net.") - 1) == 0) {
if (strncmp("net.", name, strlen("net.")) == 0) {
if (strcmp("net.change", name) == 0) {
return 0;
}
@ -307,7 +307,7 @@ int property_set(const char *name, const char *value)
*/
property_set("net.change", name);
} else if (persistent_properties_loaded &&
strncmp("persist.", name, sizeof("persist.") - 1) == 0) {
strncmp("persist.", name, strlen("persist.")) == 0) {
/*
* Don't write properties to disk until after we have read all default properties
* to prevent them from being overwritten by default values.
@ -446,8 +446,7 @@ static void load_persistent_properties()
if (dir) {
while ((entry = readdir(dir)) != NULL) {
if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..") ||
strncmp("persist.", entry->d_name, sizeof("persist.") - 1))
if (strncmp("persist.", entry->d_name, strlen("persist.")))
continue;
#if HAVE_DIRENT_D_TYPE
if (entry->d_type != DT_REG)