Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'upstream/gingerbread' into gingerbread

  • Loading branch information...
commit dc38b4be8c91a4e2865f97bad7393bd774e4b0d7 2 parents dd0dcb5 + fcc79e6
Pavel authored

Showing 2 changed files with 8 additions and 7 deletions. Show diff stats Hide diff stats

  1. +5 5 init/init.c
  2. +3 2 toolbox/watchprops.c
10 init/init.c
@@ -95,7 +95,7 @@ static unsigned battchg_pause = 0;
95 95 int add_environment(const char *key, const char *val)
96 96 {
97 97 int n;
98   -
  98 +
99 99 for (n = 0; n < 31; n++) {
100 100 if (!ENV[n]) {
101 101 size_t len = strlen(key) + strlen(val) + 2;
@@ -159,7 +159,7 @@ void service_start(struct service *svc, const char *dynamic_args)
159 159 */
160 160 svc->flags &= (~(SVC_DISABLED|SVC_RESTARTING));
161 161 svc->time_started = 0;
162   -
  162 +
163 163 /* running processes require no additional work -- if
164 164 * they're in the process of exiting, we've ensured
165 165 * that they will immediately restart on exit, unless
@@ -360,7 +360,7 @@ static void msg_start(const char *name)
360 360
361 361 svc = service_find_by_name(tmp);
362 362 }
363   -
  363 +
364 364 if (svc) {
365 365 service_start(svc, args);
366 366 } else {
@@ -710,7 +710,7 @@ int main(int argc, char **argv)
710 710 */
711 711 open_devnull_stdio();
712 712 log_init();
713   -
  713 +
714 714 INFO("reading config file\n");
715 715 init_parse_config_file("/init.rc");
716 716
@@ -765,7 +765,7 @@ int main(int argc, char **argv)
765 765 action_for_each_trigger("boot", action_add_queue_tail);
766 766
767 767 /* run all property triggers based on current state of the properties */
768   - queue_builtin_action(queue_property_triggers_action, "queue_propety_triggers");
  768 + queue_builtin_action(queue_property_triggers_action, "queue_property_triggers");
769 769
770 770
771 771 #if BOOTCHART
5 toolbox/watchprops.c
@@ -27,7 +27,7 @@ static void announce(const prop_info *pi)
27 27 char name[PROP_NAME_MAX];
28 28 char value[PROP_VALUE_MAX];
29 29 char *x;
30   -
  30 +
31 31 __system_property_read(pi, name, value);
32 32
33 33 for(x = value; *x; x++) {
@@ -43,7 +43,7 @@ int watchprops_main(int argc, char *argv[])
43 43 unsigned serial = pa->serial;
44 44 unsigned count = pa->count;
45 45 unsigned n;
46   -
  46 +
47 47 if(count >= 1024) exit(1);
48 48
49 49 for(n = 0; n < count; n++) {
@@ -55,6 +55,7 @@ int watchprops_main(int argc, char *argv[])
55 55 do {
56 56 __futex_wait(&pa->serial, serial, 0);
57 57 } while(pa->serial == serial);
  58 + serial = pa->serial;
58 59
59 60 while(count < pa->count){
60 61 watchlist[count].pi = __system_property_find_nth(count);

0 comments on commit dc38b4b

Please sign in to comment.
Something went wrong with that request. Please try again.