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

initctl: fix fallback handling in log command

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2022-05-15 11:01:58 +02:00
parent 35400f2a8b
commit 4dff8237f1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/initctl.c
+12 -8
View File
@@ -157,10 +157,13 @@ static int toggle_debug(char *arg)
static int do_log(svc_t *svc, char *tail)
{
const char *logfile = "/var/log/syslog";
char *nm = svc_ident(svc, NULL, 0);
pid_t pid = svc->pid;
pid_t pid;
char *nm;
if (!nm || !nm[0]) {
if (svc) {
nm = svc_ident(svc, NULL, 0);
pid = svc->pid;
} else {
nm = "finit";
pid = 1;
}
@@ -174,14 +177,15 @@ static int do_log(svc_t *svc, char *tail)
return systemf("cat %s | grep '\\[%d\\]\\|%s' %s", logfile, pid, nm, tail);
}
/* initctl log [-10] foo */
static int show_log(char *arg)
{
svc_t *svc;
svc_t *svc = NULL;
svc = client_svc_find(arg);
if (!svc)
return 255;
if (arg) {
svc = client_svc_find(arg);
if (!svc)
return 255;
}
return do_log(svc, "");
}