wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-09 16:50:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

initctl: show exit status/signaled like systemctl

Browse Source 
- Show if exited/signaled
 - Show status code and the std /NAME
 - Show signal value and the std /NAME

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2021-04-10 11:51:29 +02:00
parent 93039e40cc
commit c9e1c2f80f
3 changed files with 139 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/initctl.c
+42 -5
View File
@@ -607,15 +607,32 @@ static char *svc_environ(svc_t *svc, char *buf, size_t len)
return buf;
}
static char *status(svc_t *svc, int pretty)
static char *exit_status(int status, char *buf, size_t len)
{
static char buf[25];
int rc, sig;
rc = WEXITSTATUS(status);
sig = WTERMSIG(status);
if (WIFEXITED(status))
snprintf(buf, len, " (code=exited, status=%d%s)", rc, code2str(rc));
else if (WIFSIGNALED(status))
snprintf(buf, len, " (code=signaled, signal=%d%s)", sig, sig2str(sig));
return buf;
}
static char *status(svc_t *svc, int full)
{
static char buf[64];
const char *color;
char ok[64] = {0};
char *s;
s = svc_status(svc);
switch (svc->state) {
case SVC_HALTED_STATE:
exit_status(svc->status, ok, sizeof(ok));
color = "\e[1m";
break;
@@ -623,16 +640,36 @@ static char *status(svc_t *svc, int pretty)
color = "\e[1;32m";
break;
case SVC_DONE_STATE:
exit_status(svc->status, ok, sizeof(ok));
if (WIFEXITED(svc->status)) {
if (WEXITSTATUS(svc->status))
color = "\e[1;31m";
else
color = "\e[1;32m";
} else {
if (full && WIFSIGNALED(svc->status))
color = "\e[1;31m";
else
color = "\e[1;33m";
}
break;
default:
exit_status(svc->status, ok, sizeof(ok));
color = "\e[1;33m";
break;
}
if (!pretty || plain)
if (!full || plain)
color = NULL;
snprintf(buf, sizeof(buf), "%s%-8.8s%s",
color ? color : "", s, color ? "\e[0m" : "");
if (!full)
snprintf(buf, sizeof(buf), "%s%-8.8s%s",
color ? color : "", s, color ? "\e[0m" : "");
else
snprintf(buf, sizeof(buf), "%s%s%s%s",
color ? color : "", s, ok, color ? "\e[0m" : "");
return buf;
}