From 6a27ad8997d521dae9708ebfeb538977c0040cae Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sun, 7 Jun 2015 16:26:11 +0200 Subject: [PATCH] Improve output from 'finit status' Signed-off-by: Joachim Nilsson --- client.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/client.c b/client.c index 72f6bdbb..7d8a39df 100644 --- a/client.c +++ b/client.c @@ -104,6 +104,17 @@ int show_version(void) return 0; } +static char *svc_status(svc_t *svc) +{ + if (svc->pid) + return "running"; + + if (svc_is_inetd(svc)) + return "inetd"; + + return "waiting"; +} + static int show_status(void) { svc_t *svc; @@ -111,8 +122,7 @@ static int show_status(void) printf("Status PID Runlevels Service Description\n"); printf("==============================================================================\n"); for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) { - printf("%7s %-6d %-9s %-20s %s\n", - svc->pid ? "running" : "waiting", svc->pid, + printf("%7s %-6d %-9s %-20s %s\n", svc_status(svc), svc->pid, runlevel_string(svc->runlevels), svc->cmd, svc->desc); if (verbose) { int i;