From 72d95a18c10ffcc25e85019481a230a240e98564 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 21 Dec 2022 16:47:41 +0100 Subject: journalctl: port COMM= matching to path_extract_filename() --- src/journal/journalctl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/journal/journalctl.c') diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 7805c9cd9d..dd28517924 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -46,6 +46,7 @@ #include "log.h" #include "logs-show.h" #include "memory-util.h" +#include "missing_sched.h" #include "mkdir.h" #include "mount-util.h" #include "mountpoint-util.h" @@ -1119,11 +1120,11 @@ static int add_matches(sd_journal *j, char **args) { if (executable_is_script(p, &interpreter) > 0) { _cleanup_free_ char *comm = NULL; - comm = strndup(basename(p), 15); - if (!comm) - return log_oom(); + r = path_extract_filename(p, &comm); + if (r < 0) + return log_error_errno(r, "Failed to extract filename of '%s': %m", p); - t = strjoin("_COMM=", comm); + t = strjoin("_COMM=", strshorten(comm, TASK_COMM_LEN-1)); if (!t) return log_oom(); -- cgit v1.2.1