morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

loginctl: *-status: set minimum table column width if extra info will be printed

Browse Source 
Follow-up for bf366954fa

Before this commit, we hardcode "prefix" to the widest field
possible in the table. However, there's no guarantee that the
field would actually be used/added, so it could potentially
result in misalignment. Therefore, let's set the minimum width
of the cell to the hardcoded width too.
This commit is contained in:
Mike Yuan
2023-10-10 22:08:36 +08:00
committed by Luca Boccassi
parent 8fff78a1dd
commit e533dad10f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/login/loginctl.c
View File

@@ -628,6 +628,7 @@ static int print_session_status_info(sd_bus *bus, const char *path) {
if (i.scope) {
r = table_add_many(table,
TABLE_FIELD, "Unit",
TABLE_SET_MINIMUM_WIDTH, STRLEN("Display"), /* For alignment with show_unit_cgroup */
TABLE_STRING, i.scope);
if (r < 0)
return table_log_add_error(r);
@@ -732,6 +733,7 @@ static int print_user_status_info(sd_bus *bus, const char *path) {
if (i.slice) {
r = table_add_many(table,
TABLE_FIELD, "Unit",
TABLE_SET_MINIMUM_WIDTH, STRLEN("Sessions"), /* For alignment with show_unit_cgroup */
TABLE_STRING, i.slice);
if (r < 0)
return table_log_add_error(r);
@@ -805,6 +807,7 @@ static int print_seat_status_info(sd_bus *bus, const char *path) {
if (arg_transport == BUS_TRANSPORT_LOCAL) {
r = table_add_many(table,
TABLE_FIELD, "Devices",
TABLE_SET_MINIMUM_WIDTH, STRLEN("Sessions"), /* For alignment with show_sysfs */
TABLE_EMPTY);
if (r < 0)
return table_log_add_error(r);