Revert last patch

This commit is contained in:
Roy Marples
2007-09-25 17:30:07 +00:00
parent 1a6451654f
commit c6c7df47a0
14 changed files with 378 additions and 365 deletions

View File

@@ -33,21 +33,20 @@ static void print_service (char *service)
int cols = printf (" %s\n", service);
einfo_color_t color = ecolor_bad;
if (rc_service_state (service, rc_service_stopping) == 0)
if (rc_service_state (service, rc_service_stopping))
snprintf (status, sizeof (status), "stopping ");
else if (rc_service_state (service, rc_service_starting) == 0) {
else if (rc_service_state (service, rc_service_starting)) {
snprintf (status, sizeof (status), "starting ");
color = ecolor_warn;
} else if (rc_service_state (service, rc_service_inactive) == 0) {
} else if (rc_service_state (service, rc_service_inactive)) {
snprintf (status, sizeof (status), "inactive ");
color = ecolor_warn;
} else if (geteuid () == 0 &&
rc_service_state (service, rc_service_crashed) == 0)
} else if (geteuid () == 0 && rc_service_state (service, rc_service_crashed))
snprintf (status, sizeof (status), " crashed ");
else if (rc_service_state (service, rc_service_started) == 0) {
else if (rc_service_state (service, rc_service_started)) {
snprintf (status, sizeof (status), " started ");
color = ecolor_good;
} else if (rc_service_state (service, rc_service_scheduled) == 0) {
} else if (rc_service_state (service, rc_service_scheduled)) {
snprintf (status, sizeof (status), "scheduled");
color = ecolor_warn;
} else
@@ -108,7 +107,7 @@ int rc_status (int argc, char **argv)
STRLIST_FOREACH (services, service, i) {
bool found = false;
STRLIST_FOREACH (levels, level, j)
if (rc_service_in_runlevel (service, level) == 0) {
if (rc_service_in_runlevel (service, level)) {
found = true;
break;
}