Reduce column width spam by snapd

This commit is contained in:
Benny Baumann 2022-02-27 20:57:05 +01:00 committed by BenBE
parent edf319e53d
commit 23b56193d7
1 changed files with 18 additions and 0 deletions

View File

@ -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_monitor_label = "/supervisor";
const char* str_nspawn_payload_label = "/payload"; const char* str_nspawn_payload_label = "/payload";
const char* str_snap_scope_prefix = "snap.";
const char* str_service_suffix = ".service"; const char* str_service_suffix = ".service";
const char* str_scope_suffix = ".scope"; 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)) else if (String_startsWith(nextSlash, str_nspawn_payload_label))
cgroup += strlen(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; continue;
} }