shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00
Code

systemctl: prepend machine ID to unit ID in list-sockets

Browse Source 
We do it that way in all other list-* functions, so let's be consistent.
This commit is contained in:
David Tardon 2023-02-20 20:00:29 +01:00
parent ac1405960a
commit f748b2d01a
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/systemctl/systemctl-list-units.c
View File

@ -398,21 +398,16 @@ static int output_sockets_list(struct socket_info *socket_infos, size_t cs) {
table_set_ersatz_string(table, TABLE_ERSATZ_DASH);
for (struct socket_info *s = socket_infos; s < socket_infos + cs; s++) {
_cleanup_free_ char *j = NULL;
const char *path;
_cleanup_free_ char *unit = NULL;
if (s->machine) {
j = strjoin(s->machine, ":", s->path);
if (!j)
return log_oom();
path = j;
} else
path = s->path;
unit = format_unit_id(s->id, s->machine);
if (!unit)
return log_oom();
r = table_add_many(table,
TABLE_STRING, path,
TABLE_STRING, s->path,
TABLE_STRING, s->type,
TABLE_STRING, s->id);
TABLE_STRING, unit);
if (r < 0)
return table_log_add_error(r);