dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

loginctl: show null fields for unset seat/tty fields of sessions

Browse Source
This commit is contained in:
Lennart Poettering
2023-11-27 15:10:42 +01:00
parent 8bfa22f079
commit febfec0849
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/login/loginctl.c
View File

@@ -208,8 +208,8 @@ static int list_sessions(int argc, char *argv[], void *userdata) {
TABLE_STRING, id,
TABLE_UID, (uid_t) uid,
TABLE_STRING, user,
TABLE_STRING, seat,
TABLE_STRING, strna(i.tty),
TABLE_STRING, empty_to_null(seat),
TABLE_STRING, empty_to_null(i.tty),
TABLE_STRING, i.state,
TABLE_BOOLEAN, i.idle_hint);
if (r < 0)
@@ -547,22 +547,25 @@ static int print_session_status_info(sd_bus *bus, const char *path) {
return table_log_add_error(r);
}
r = table_add_cell(table, NULL, TABLE_FIELD, "Seat");
if (r < 0)
return table_log_add_error(r);
if (i.vtnr > 0)
r = table_add_cell_stringf(table, NULL, "%s; vc%u", i.seat, i.vtnr);
else
r = table_add_cell(table, NULL, TABLE_STRING, i.seat);
if (r < 0)
return table_log_add_error(r);
if (!isempty(i.seat)) {
r = table_add_cell(table, NULL, TABLE_FIELD, "Seat");
if (r < 0)
return table_log_add_error(r);
if (i.tty)
if (i.vtnr > 0)
r = table_add_cell_stringf(table, NULL, "%s; vc%u", i.seat, i.vtnr);
else
r = table_add_cell(table, NULL, TABLE_STRING, i.seat);
if (r < 0)
return table_log_add_error(r);
}
if (!isempty(i.tty))
r = table_add_many(table,
TABLE_FIELD, "TTY",
TABLE_STRING, i.tty);
else if (i.display)
else if (!isempty(i.display))
r = table_add_many(table,
TABLE_FIELD, "Display",
TABLE_STRING, i.display);