Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'upstream/gingerbread' into gingerbread

  • Loading branch information...
commit dc38b4be8c91a4e2865f97bad7393bd774e4b0d7 2 parents dd0dcb5 + fcc79e6
@nadlabak authored
Showing with 8 additions and 7 deletions.
  1. +5 −5 init/init.c
  2. +3 −2 toolbox/watchprops.c
View
10 init/init.c
@@ -95,7 +95,7 @@ static unsigned battchg_pause = 0;
int add_environment(const char *key, const char *val)
{
int n;
-
+
for (n = 0; n < 31; n++) {
if (!ENV[n]) {
size_t len = strlen(key) + strlen(val) + 2;
@@ -159,7 +159,7 @@ void service_start(struct service *svc, const char *dynamic_args)
*/
svc->flags &= (~(SVC_DISABLED|SVC_RESTARTING));
svc->time_started = 0;
-
+
/* running processes require no additional work -- if
* they're in the process of exiting, we've ensured
* that they will immediately restart on exit, unless
@@ -360,7 +360,7 @@ static void msg_start(const char *name)
svc = service_find_by_name(tmp);
}
-
+
if (svc) {
service_start(svc, args);
} else {
@@ -710,7 +710,7 @@ int main(int argc, char **argv)
*/
open_devnull_stdio();
log_init();
-
+
INFO("reading config file\n");
init_parse_config_file("/init.rc");
@@ -765,7 +765,7 @@ int main(int argc, char **argv)
action_for_each_trigger("boot", action_add_queue_tail);
/* run all property triggers based on current state of the properties */
- queue_builtin_action(queue_property_triggers_action, "queue_propety_triggers");
+ queue_builtin_action(queue_property_triggers_action, "queue_property_triggers");
#if BOOTCHART
View
5 toolbox/watchprops.c
@@ -27,7 +27,7 @@ static void announce(const prop_info *pi)
char name[PROP_NAME_MAX];
char value[PROP_VALUE_MAX];
char *x;
-
+
__system_property_read(pi, name, value);
for(x = value; *x; x++) {
@@ -43,7 +43,7 @@ int watchprops_main(int argc, char *argv[])
unsigned serial = pa->serial;
unsigned count = pa->count;
unsigned n;
-
+
if(count >= 1024) exit(1);
for(n = 0; n < count; n++) {
@@ -55,6 +55,7 @@ int watchprops_main(int argc, char *argv[])
do {
__futex_wait(&pa->serial, serial, 0);
} while(pa->serial == serial);
+ serial = pa->serial;
while(count < pa->count){
watchlist[count].pi = __system_property_find_nth(count);
Please sign in to comment.
Something went wrong with that request. Please try again.