emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check list existance before iterating, Gentoo #216091.

Browse Source
This commit is contained in:
Roy Marples 2008-04-04 16:31:56 +00:00
parent 5ebe7f1349
commit c18c4fc4cc
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/rc/runscript.c
View File

@ -648,6 +648,19 @@ static void setup_types(void)
rc_stringlist_add(types_mua, "beforeme"); rc_stringlist_add(types_mua, "beforeme");
} }
static bool in_list(RC_STRINGLIST *list, char *string)
{
RC_STRING *s;
if (! list)
return false;
TAILQ_FOREACH(s, list, entries)
if (strcmp(s->value, string) == 0)
return true;
return false;
}
static void svc_start(bool deps) static void svc_start(bool deps)
{ {
bool started; bool started;
@ -747,35 +760,29 @@ static void svc_start(bool deps)
/* Don't wait for services which went inactive but are now in /* Don't wait for services which went inactive but are now in
* starting state which we are after */ * starting state which we are after */
if (svcs & RC_SERVICE_STARTING && if (svcs & RC_SERVICE_STARTING &&
svcs & RC_SERVICE_WASINACTIVE) { svcs & RC_SERVICE_WASINACTIVE)
TAILQ_FOREACH(svc2, use_services, entries) { {
if (strcmp (svc->value, svc2->value) == 0) if (!in_list(need_services, svc->value) &&
break; !in_list(use_services, svc->value))
}
if (! svc2)
continue; continue;
} }
if (! svc_wait(svc->value)) if (! svc_wait(svc->value))
eerror ("%s: timed out waiting for %s", eerror ("%s: timed out waiting for %s",
applet, svc->value); applet, svc->value);
if (! need_services)
continue;
if ((svcs = rc_service_state(svc->value)) & RC_SERVICE_STARTED) if ((svcs = rc_service_state(svc->value)) & RC_SERVICE_STARTED)
continue; continue;
TAILQ_FOREACH(svc2, need_services, entries) { if (in_list(need_services, svc->value)) {
if (strcmp (svc->value, svc2->value) == 0) { if (svcs & RC_SERVICE_INACTIVE ||
if (svcs & RC_SERVICE_INACTIVE || svcs & RC_SERVICE_WASINACTIVE)
svcs & RC_SERVICE_WASINACTIVE) {
{ if (! tmplist)
if (! tmplist) tmplist = rc_stringlist_new();
tmplist = rc_stringlist_new(); rc_stringlist_add(tmplist, svc->value);
rc_stringlist_add(tmplist, svc->value); } else
} else eerrorx("ERROR: cannot start %s as"
eerrorx("ERROR: cannot start %s as" " %s would not start",
" %s would not start", applet, svc->value);
applet, svc->value);
}
} }
} }
@ -932,12 +939,12 @@ static void svc_stop(bool deps)
TAILQ_FOREACH_REVERSE(svc, services, rc_stringlist, entries) { TAILQ_FOREACH_REVERSE(svc, services, rc_stringlist, entries) {
RC_SERVICE svcs = rc_service_state(svc->value); RC_SERVICE svcs = rc_service_state(svc->value);
if (svcs & RC_SERVICE_STARTED || if (svcs & RC_SERVICE_STARTED ||
svcs & RC_SERVICE_INACTIVE) svcs & RC_SERVICE_INACTIVE)
{ {
svc_wait(svc->value); svc_wait(svc->value);
svcs = rc_service_state(svc->value); svcs = rc_service_state(svc->value);
if (svcs & RC_SERVICE_STARTED || if (svcs & RC_SERVICE_STARTED ||
svcs & RC_SERVICE_INACTIVE) svcs & RC_SERVICE_INACTIVE)
{ {
pid_t pid = service_stop(svc->value); pid_t pid = service_stop(svc->value);
if (! rc_conf_yesno("rc_parallel")) if (! rc_conf_yesno("rc_parallel"))
@ -964,9 +971,9 @@ static void svc_stop(bool deps)
/* If shutting down, we should stop even /* If shutting down, we should stop even
* if a dependant failed */ * if a dependant failed */
if (runlevel && if (runlevel &&
(strcmp(runlevel, RC_LEVEL_SHUTDOWN) == 0 || (strcmp(runlevel, RC_LEVEL_SHUTDOWN) == 0 ||
strcmp(runlevel, RC_LEVEL_REBOOT) == 0 || strcmp(runlevel, RC_LEVEL_REBOOT) == 0 ||
strcmp(runlevel, RC_LEVEL_SINGLE) == 0)) strcmp(runlevel, RC_LEVEL_SINGLE) == 0))
continue; continue;
rc_service_mark(service, RC_SERVICE_FAILED); rc_service_mark(service, RC_SERVICE_FAILED);
} }