clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 13:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemctl: let list-{units,unit-files } honour --type

Browse Source 
The docs don't clarify what is expected, but I don't see any reason
why --type should be ignored.

Also restucture the compund conditions into separate clauses for
easier reading.

(cherry picked from commit 6c71341aee)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-11-02 16:40:26 -05:00
parent 1c7a80d774
commit 4ffc217225
1 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+37 -11
View File
@@ -301,21 +301,37 @@ static int compare_unit_info(const void *a, const void *b) {
}
static bool output_show_unit(const UnitInfo *u, char **patterns) {
const char *dot;
if (!strv_isempty(patterns)) {
char **pattern;
STRV_FOREACH(pattern, patterns)
if (fnmatch(*pattern, u->id, FNM_NOESCAPE) == 0)
return true;
goto next;
return false;
}
return (!arg_types || ((dot = strrchr(u->id, '.')) &&
strv_find(arg_types, dot+1))) &&
(arg_all || !(streq(u->active_state, "inactive")
|| u->following[0]) || u->job_id > 0);
next:
if (arg_types) {
const char *dot;
dot = strrchr(u->id, '.');
if (!dot)
return false;
if (!strv_find(arg_types, dot+1))
return false;
}
if (arg_all)
return true;
if (u->job_id > 0)
return true;
if (streq(u->active_state, "inactive") || u->following[0])
return false;
return true;
}
static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
@@ -1231,18 +1247,28 @@ static int compare_unit_file_list(const void *a, const void *b) {
}
static bool output_show_unit_file(const UnitFileList *u, char **patterns) {
const char *dot;
if (!strv_isempty(patterns)) {
char **pattern;
STRV_FOREACH(pattern, patterns)
if (fnmatch(*pattern, basename(u->path), FNM_NOESCAPE) == 0)
return true;
goto next;
return false;
}
return !arg_types || ((dot = strrchr(u->path, '.')) && strv_find(arg_types, dot+1));
next:
if (!strv_isempty(arg_types)) {
const char *dot;
dot = strrchr(u->path, '.');
if (!dot)
return false;
if (!strv_find(arg_types, dot+1))
return false;
}
return true;
}
static void output_unit_file_list(const UnitFileList *units, unsigned c) {