From 23b56193d7e8fd01b755c2dd269a19a5de2cc68d Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 27 Feb 2022 20:57:05 +0100 Subject: Reduce column width spam by snapd --- linux/CGroupUtils.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/linux/CGroupUtils.c b/linux/CGroupUtils.c index 765012d3..d6d2ae8f 100644 --- a/linux/CGroupUtils.c +++ b/linux/CGroupUtils.c @@ -76,6 +76,8 @@ static bool CGroup_filterName_internal(const char *cgroup, StrBuf_state* s, StrB const char* str_nspawn_monitor_label = "/supervisor"; const char* str_nspawn_payload_label = "/payload"; + const char* str_snap_scope_prefix = "snap."; + const char* str_service_suffix = ".service"; const char* str_scope_suffix = ".scope"; @@ -266,6 +268,22 @@ static bool CGroup_filterName_internal(const char *cgroup, StrBuf_state* s, StrB else if (String_startsWith(nextSlash, str_nspawn_payload_label)) cgroup += strlen(str_nspawn_payload_label); + continue; + } else if(Label_checkPrefix(labelStart, scopeNameLen, str_snap_scope_prefix)) { + const char* nextDot = strchrnul(labelStart + strlen(str_snap_scope_prefix), '.'); + + if (!StrBuf_putsz(s, w, "!snap:")) + return false; + + if (nextDot >= labelStart + scopeNameLen) { + nextDot = labelStart + scopeNameLen; + } + + if (!StrBuf_putsn(s, w, labelStart + strlen(str_snap_scope_prefix), nextDot - (labelStart + strlen(str_snap_scope_prefix)))) + return false; + + cgroup = nextSlash; + continue; } -- cgit v1.2.3