diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-01-14 05:05:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-01-14 05:05:22 +0000 |
| commit | 6aab712cb4220c5a8471ba581c06676af19fae07 (patch) | |
| tree | 2f343d11a00563fc5efd4baf81c082f280db4f96 /src/rc/runscript.c | |
| parent | b054a7251b91e2b95290dfd3760f942186c2d864 (diff) | |
| download | openrc-6aab712cb4220c5a8471ba581c06676af19fae07.tar.gz openrc-6aab712cb4220c5a8471ba581c06676af19fae07.tar.bz2 openrc-6aab712cb4220c5a8471ba581c06676af19fae07.tar.xz | |
strip trailing newlines
Diffstat (limited to 'src/rc/runscript.c')
| -rw-r--r-- | src/rc/runscript.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rc/runscript.c b/src/rc/runscript.c index e136e94..a80e25f 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -3,7 +3,7 @@ * Handle launching of init scripts. */ -/* +/* * Copyright 2007 Roy Marples * All rights reserved @@ -181,7 +181,7 @@ static void handle_signal (int sig) if (! signame[0]) snprintf (signame, sizeof (signame), "SIGQUIT"); /* Send the signal to our children too */ - if (service_pid > 0) + if (service_pid > 0) kill (service_pid, sig); eerrorx ("%s: caught %s, aborting", applet, signame); @@ -511,7 +511,7 @@ static bool svc_wait (rc_depinfo_t *depinfo, const char *svc) return (false); /* Some services don't have a timeout, like checkroot and checkfs */ - keywords = rc_deptree_depend (depinfo, svc, "keywords"); + keywords = rc_deptree_depend (depinfo, svc, "keywords"); STRLIST_FOREACH (keywords, s, i) { if (strcmp (s, "notimeout") == 0) { forever = true; @@ -765,8 +765,8 @@ static void svc_start (bool deps) STRLIST_FOREACH (tmplist, svc, i) { rc_service_schedule_start (svc, service); rc_strlist_free (providelist); - providelist = rc_deptree_depend (deptree, "iprovide", svc); - STRLIST_FOREACH (providelist, svc2, j) + providelist = rc_deptree_depend (deptree, "iprovide", svc); + STRLIST_FOREACH (providelist, svc2, j) rc_service_schedule_start (svc2, service); len += strlen (svc) + 2; @@ -856,7 +856,7 @@ static void svc_stop (bool deps) exit (EXIT_FAILURE); if (rc_yesno (getenv ("IN_HOTPLUG")) || in_background) - if (! (state & RC_SERVICE_STARTED) && + if (! (state & RC_SERVICE_STARTED) && ! (state & RC_SERVICE_INACTIVE)) exit (EXIT_FAILURE); @@ -900,12 +900,12 @@ static void svc_stop (bool deps) rc_strlist_reverse (services); STRLIST_FOREACH (services, svc, i) { rc_service_state_t svcs = rc_service_state (svc); - if (svcs & RC_SERVICE_STARTED || + if (svcs & RC_SERVICE_STARTED || svcs & RC_SERVICE_INACTIVE) { svc_wait (deptree, svc); svcs = rc_service_state (svc); - if (svcs & RC_SERVICE_STARTED || + if (svcs & RC_SERVICE_STARTED || svcs & RC_SERVICE_INACTIVE) { pid_t pid = rc_service_stop (svc); |