system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-16 06:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28963 from YHNdnzj/loginctl-table

Browse source 
loginctl: use vertical table for {user,session,seat}-status
This commit is contained in:
Luca Boccassi 2023-09-03 14:04:24 +01:00 committed by GitHub
parent 62f643a34d bf366954fa
commit 4b246347ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 335 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/basic/string-util.h
View file

@ -196,6 +196,17 @@ int strextendf_with_separator(char **x, const char *separator, const char *forma
char *strrep(const char *s, unsigned n);
#define strrepa(s, n) \
({ \
char *_d_, *_p_; \
size_t _len_ = strlen(s) * n; \
_p_ = _d_ = newa(char, _len_ + 1); \
for (unsigned _i_ = 0; _i_ < n; _i_++) \
_p_ = stpcpy(_p_, s); \
*_p_ = 0; \
_d_; \
})
int split_pair(const char *s, const char *sep, char **l, char **r);
int free_and_strdup(char **p, const char *s);

518
src/login/loginctl.c
View file

@ -113,32 +113,6 @@ static OutputFlags get_output_flags(void) {
colors_enabled() * OUTPUT_COLOR;
}
static int get_session_path(sd_bus *bus, const char *session_id, sd_bus_error *error, char **path) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
char *ans;
int r;
assert(bus);
assert(session_id);
assert(error);
assert(path);
r = bus_call_method(bus, bus_login_mgr, "GetSession", error, &reply, "s", session_id);
if (r < 0)
return r;
r = sd_bus_message_read(reply, "o", &ans);
if (r < 0)
return r;
ans = strdup(ans);
if (!ans)
return -ENOMEM;
*path = ans;
return 0;
}
static int show_table(Table *table, const char *word) {
int r;
@ -375,14 +349,20 @@ static int list_seats(int argc, char *argv[], void *userdata) {
return show_table(table, "seats");
}
static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit, pid_t leader) {
_cleanup_free_ char *cgroup = NULL;
static int show_unit_cgroup(
sd_bus *bus,
const char *unit,
pid_t leader,
const char *prefix) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *cgroup = NULL;
unsigned c;
int r;
assert(bus);
assert(unit);
assert(prefix);
r = show_cgroup_get_unit_path_and_warn(bus, unit, &cgroup);
if (r < 0)
@ -394,12 +374,9 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit
c = columns();
if (c > 18)
c -= 18;
else
c = 0;
r = unit_show_processes(bus, unit, cgroup, "\t\t ", c, get_output_flags(), &error);
r = unit_show_processes(bus, unit, cgroup, prefix, c, get_output_flags(), &error);
if (r == -EBADR) {
if (arg_transport == BUS_TRANSPORT_REMOTE)
return 0;
@ -408,7 +385,7 @@ static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit
if (cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, cgroup) != 0 && leader <= 0)
return 0;
show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, cgroup, "\t\t ", c, &leader, leader > 0, get_output_flags());
show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, cgroup, prefix, c, &leader, leader > 0, get_output_flags());
} else if (r < 0)
return log_error_errno(r, "Failed to dump process list: %s", bus_error_message(&error, r));
@ -467,7 +444,25 @@ static int prop_map_sessions_strv(sd_bus *bus, const char *member, sd_bus_messag
return sd_bus_message_exit_container(m);
}
static int print_session_status_info(sd_bus *bus, const char *path, bool *new_line) {
static int mark_session(char **sessions, const char *target_session) {
assert(sessions);
assert(target_session);
STRV_FOREACH(i, sessions)
if (streq(*i, target_session)) {
_cleanup_free_ char *marked = NULL;
marked = strjoin("*", target_session);
if (!marked)
return log_oom();
return free_and_replace(*i, marked);
}
return 0;
}
static int print_session_status_info(sd_bus *bus, const char *path) {
static const struct bus_properties_map map[] = {
{ "Id", "s", NULL, offsetof(SessionStatusInfo, id) },
@ -497,6 +492,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
SessionStatusInfo i = {};
int r;
@ -504,95 +500,148 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
if (r < 0)
return log_error_errno(r, "Could not get properties: %s", bus_error_message(&error, r));
if (*new_line)
printf("\n");
table = table_new_vertical();
if (!table)
return log_oom();
*new_line = true;
if (dual_timestamp_is_set(&i.timestamp)) {
r = table_add_cell(table, NULL, TABLE_FIELD, "Since");
if (r < 0)
return table_log_add_error(r);
printf("%s - ", strna(i.id));
r = table_add_cell_stringf(table, NULL, "%s; %s",
FORMAT_TIMESTAMP(i.timestamp.realtime),
FORMAT_TIMESTAMP_RELATIVE_MONOTONIC(i.timestamp.monotonic));
if (r < 0)
return table_log_add_error(r);
}
if (i.name)
printf("%s (" UID_FMT ")\n", i.name, i.uid);
else
printf(UID_FMT "\n", i.uid);
if (dual_timestamp_is_set(&i.timestamp))
printf("\t Since: %s; %s\n",
FORMAT_TIMESTAMP(i.timestamp.realtime),
FORMAT_TIMESTAMP_RELATIVE_MONOTONIC(i.timestamp.monotonic));
r = table_add_many(table,
TABLE_FIELD, "State",
TABLE_STRING, i.state);
if (r < 0)
return table_log_add_error(r);
if (i.leader > 0) {
_cleanup_free_ char *t = NULL;
_cleanup_free_ char *name = NULL;
printf("\t Leader: " PID_FMT, i.leader);
(void) get_process_comm(i.leader, &name);
(void) get_process_comm(i.leader, &t);
if (t)
printf(" (%s)", t);
r = table_add_cell(table, NULL, TABLE_FIELD, "Leader");
if (r < 0)
return table_log_add_error(r);
printf("\n");
r = table_add_cell_stringf(table, NULL, PID_FMT "%s%s%s",
i.leader,
!isempty(name) ? " (" : "",
strempty(name),
!isempty(name) ? ")" : "");
if (r < 0)
return table_log_add_error(r);
}
if (!isempty(i.seat)) {
printf("\t Seat: %s", i.seat);
r = table_add_cell(table, NULL, TABLE_FIELD, "Seat");
if (r < 0)
return table_log_add_error(r);
if (i.vtnr > 0)
printf("; vc%u", i.vtnr);
printf("\n");
}
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 (i.tty)
printf("\t TTY: %s\n", i.tty);
r = table_add_many(table,
TABLE_FIELD, "TTY",
TABLE_STRING, i.tty);
else if (i.display)
printf("\t Display: %s\n", i.display);
r = table_add_many(table,
TABLE_FIELD, "Display",
TABLE_STRING, i.display);
else
r = 0;
if (r < 0)
return table_log_add_error(r);
r = table_add_cell(table, NULL, TABLE_FIELD, "Remote");
if (r < 0)
return table_log_add_error(r);
if (i.remote_host && i.remote_user)
printf("\t Remote: %s@%s\n", i.remote_user, i.remote_host);
r = table_add_cell_stringf(table, NULL, "%s@%s", i.remote_user, i.remote_host);
else if (i.remote_host)
printf("\t Remote: %s\n", i.remote_host);
r = table_add_cell(table, NULL, TABLE_STRING, i.remote_host);
else if (i.remote_user)
printf("\t Remote: user %s\n", i.remote_user);
else if (i.remote)
printf("\t Remote: Yes\n");
r = table_add_cell_stringf(table, NULL, "user %s", i.remote_user);
else
r = table_add_cell(table, NULL, TABLE_BOOLEAN, &i.remote);
if (r < 0)
return table_log_add_error(r);
if (i.service) {
printf("\t Service: %s", i.service);
r = table_add_many(table,
TABLE_FIELD, "Service",
TABLE_STRING, i.service);
if (r < 0)
return table_log_add_error(r);
}
if (i.type)
printf("; type %s", i.type);
if (i.type) {
r = table_add_many(table,
TABLE_FIELD, "Type",
TABLE_STRING, i.type);
if (r < 0)
return table_log_add_error(r);
}
if (i.class)
printf("; class %s", i.class);
if (i.class) {
r = table_add_many(table,
TABLE_FIELD, "Class",
TABLE_STRING, i.class);
if (r < 0)
return table_log_add_error(r);
}
printf("\n");
} else if (i.type) {
printf("\t Type: %s", i.type);
if (!isempty(i.desktop)) {
r = table_add_many(table,
TABLE_FIELD, "Desktop",
TABLE_STRING, i.desktop);
if (r < 0)
return table_log_add_error(r);
}
if (i.class)
printf("; class %s", i.class);
printf("\n");
} else if (i.class)
printf("\t Class: %s\n", i.class);
if (!isempty(i.desktop))
printf("\t Desktop: %s\n", i.desktop);
if (i.state)
printf("\t State: %s\n", i.state);
r = table_add_cell(table, NULL, TABLE_FIELD, "Idle");
if (r < 0)
return table_log_add_error(r);
if (i.idle_hint && dual_timestamp_is_set(&i.idle_hint_timestamp))
printf("\t Idle: %s since %s (%s)\n",
yes_no(i.idle_hint),
FORMAT_TIMESTAMP(i.idle_hint_timestamp.realtime),
FORMAT_TIMESTAMP_RELATIVE_MONOTONIC(i.idle_hint_timestamp.monotonic));
r = table_add_cell_stringf(table, NULL, "%s since %s (%s)",
yes_no(i.idle_hint),
FORMAT_TIMESTAMP(i.idle_hint_timestamp.realtime),
FORMAT_TIMESTAMP_RELATIVE_MONOTONIC(i.idle_hint_timestamp.monotonic));
else
printf("\t Idle: %s\n", yes_no(i.idle_hint));
r = table_add_cell(table, NULL, TABLE_BOOLEAN, &i.idle_hint);
if (r < 0)
return table_log_add_error(r);
if (i.scope) {
printf("\t Unit: %s\n", i.scope);
show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader);
r = table_add_many(table,
TABLE_FIELD, "Unit",
TABLE_STRING, i.scope);
if (r < 0)
return table_log_add_error(r);
}
/* We don't use the table to show the header, in order to make the width of the column stable. */
printf("%s%s - %s (" UID_FMT ")%s\n", ansi_highlight(), i.id, i.name, i.uid, ansi_normal());
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
if (i.scope) {
show_unit_cgroup(bus, i.scope, i.leader, /* prefix = */ strrepa(" ", STRLEN("Display: ")));
if (arg_transport == BUS_TRANSPORT_LOCAL)
show_journal_by_unit(
@ -613,7 +662,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
return 0;
}
static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line) {
static int print_user_status_info(sd_bus *bus, const char *path) {
static const struct bus_properties_map map[] = {
{ "Name", "s", NULL, offsetof(UserStatusInfo, name) },
@ -631,66 +680,92 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
_cleanup_(user_status_info_done) UserStatusInfo i = {};
_cleanup_(table_unrefp) Table *table = NULL;
int r;
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, BUS_MAP_BOOLEAN_AS_BOOL, &error, &m, &i);
if (r < 0)
return log_error_errno(r, "Could not get properties: %s", bus_error_message(&error, r));
if (*new_line)
printf("\n");
table = table_new_vertical();
if (!table)
return log_oom();
*new_line = true;
if (dual_timestamp_is_set(&i.timestamp)) {
r = table_add_cell(table, NULL, TABLE_FIELD, "Since");
if (r < 0)
return table_log_add_error(r);
if (i.name)
printf("%s (%"PRIu32")\n", i.name, i.uid);
else
printf("%"PRIu32"\n", i.uid);
if (dual_timestamp_is_set(&i.timestamp))
printf("\t Since: %s; %s\n",
FORMAT_TIMESTAMP(i.timestamp.realtime),
FORMAT_TIMESTAMP_RELATIVE_MONOTONIC(i.timestamp.monotonic));
if (!isempty(i.state))
printf("\t State: %s\n", i.state);
if (!strv_isempty(i.sessions)) {
printf("\tSessions:");
STRV_FOREACH(l, i.sessions)
printf(" %s%s",
streq_ptr(*l, i.display) ? "*" : "",
*l);
printf("\n");
r = table_add_cell_stringf(table, NULL, "%s; %s",
FORMAT_TIMESTAMP(i.timestamp.realtime),
FORMAT_TIMESTAMP_RELATIVE_MONOTONIC(i.timestamp.monotonic));
if (r < 0)
return table_log_add_error(r);
}
printf("\t Linger: %s\n", yes_no(i.linger));
r = table_add_many(table,
TABLE_FIELD, "State",
TABLE_STRING, i.state);
if (r < 0)
return table_log_add_error(r);
if (!strv_isempty(i.sessions)) {
_cleanup_strv_free_ char **sessions = TAKE_PTR(i.sessions);
r = mark_session(sessions, i.display);
if (r < 0)
return r;
r = table_add_many(table,
TABLE_FIELD, "Sessions",
TABLE_STRV_WRAPPED, sessions);
if (r < 0)
return table_log_add_error(r);
}
r = table_add_many(table,
TABLE_FIELD, "Linger",
TABLE_BOOLEAN, i.linger);
if (r < 0)
return table_log_add_error(r);
if (i.slice) {
printf("\t Unit: %s\n", i.slice);
show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0);
r = table_add_many(table,
TABLE_FIELD, "Unit",
TABLE_STRING, i.slice);
if (r < 0)
return table_log_add_error(r);
}
show_journal_by_unit(
stdout,
i.slice,
NULL,
arg_output,
0,
i.timestamp.monotonic,
arg_lines,
0,
get_output_flags() | OUTPUT_BEGIN_NEWLINE,
SD_JOURNAL_LOCAL_ONLY,
true,
NULL);
printf("%s%s (" UID_FMT ")%s\n", ansi_highlight(), i.name, i.uid, ansi_normal());
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
if (i.slice) {
show_unit_cgroup(bus, i.slice, /* leader = */ 0, /* prefix = */ strrepa(" ", STRLEN("Sessions: ")));
if (arg_transport == BUS_TRANSPORT_LOCAL)
show_journal_by_unit(
stdout,
i.slice,
NULL,
arg_output,
0,
i.timestamp.monotonic,
arg_lines,
0,
get_output_flags() | OUTPUT_BEGIN_NEWLINE,
SD_JOURNAL_LOCAL_ONLY,
true,
NULL);
}
return 0;
}
static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line) {
static int print_seat_status_info(sd_bus *bus, const char *path) {
static const struct bus_properties_map map[] = {
{ "Id", "s", NULL, offsetof(SeatStatusInfo, id) },
@ -702,44 +777,51 @@ static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line)
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
_cleanup_(seat_status_info_done) SeatStatusInfo i = {};
_cleanup_(table_unrefp) Table *table = NULL;
int r;
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, 0, &error, &m, &i);
if (r < 0)
return log_error_errno(r, "Could not get properties: %s", bus_error_message(&error, r));
if (*new_line)
printf("\n");
*new_line = true;
printf("%s\n", strna(i.id));
table = table_new_vertical();
if (!table)
return log_oom();
if (!strv_isempty(i.sessions)) {
printf("\tSessions:");
_cleanup_strv_free_ char **sessions = TAKE_PTR(i.sessions);
STRV_FOREACH(l, i.sessions) {
if (streq_ptr(*l, i.active_session))
printf(" *%s", *l);
else
printf(" %s", *l);
}
r = mark_session(sessions, i.active_session);
if (r < 0)
return r;
printf("\n");
r = table_add_many(table,
TABLE_FIELD, "Sessions",
TABLE_STRV_WRAPPED, sessions);
if (r < 0)
return table_log_add_error(r);
}
if (arg_transport == BUS_TRANSPORT_LOCAL) {
unsigned c;
r = table_add_many(table,
TABLE_FIELD, "Devices",
TABLE_EMPTY);
if (r < 0)
return table_log_add_error(r);
}
c = columns();
printf("%s%s%s\n", ansi_highlight(), i.id, ansi_normal());
r = table_print(table, NULL);
if (r < 0)
return table_log_print_error(r);
if (arg_transport == BUS_TRANSPORT_LOCAL) {
unsigned c = columns();
if (c > 21)
c -= 21;
else
c = 0;
printf("\t Devices:\n");
show_sysfs(i.id, "\t\t ", c, get_output_flags());
show_sysfs(i.id, strrepa(" ", STRLEN("Sessions:")), c, get_output_flags());
}
return 0;
@ -825,17 +907,11 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m
return 0;
}
static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
static int show_properties(sd_bus *bus, const char *path) {
int r;
assert(bus);
assert(path);
assert(new_line);
if (*new_line)
printf("\n");
*new_line = true;
r = bus_print_all_properties(
bus,
@ -851,12 +927,46 @@ static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
return 0;
}
static int show_session(int argc, char *argv[], void *userdata) {
bool properties, new_line = false;
sd_bus *bus = ASSERT_PTR(userdata);
int r;
static int get_bus_path_by_id(
sd_bus *bus,
const char *type,
const char *method,
const char *id,
char **ret) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *path = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_free_ char *p = NULL;
const char *path;
int r;
assert(bus);
assert(type);
assert(STR_IN_SET(type, "session", "seat"));
assert(method);
assert(id);
assert(ret);
r = bus_call_method(bus, bus_login_mgr, method, &error, &reply, "s", id);
if (r < 0)
return log_error_errno(r, "Failed to get path for %s '%s': %s", type, id, bus_error_message(&error, r));
r = sd_bus_message_read(reply, "o", &path);
if (r < 0)
return bus_log_parse_error(r);
p = strdup(path);
if (!p)
return log_oom();
*ret = TAKE_PTR(p);
return 0;
}
static int show_session(int argc, char *argv[], void *userdata) {
sd_bus *bus = ASSERT_PTR(userdata);
bool properties;
int r;
assert(argv);
@ -867,21 +977,25 @@ static int show_session(int argc, char *argv[], void *userdata) {
if (argc <= 1) {
/* If no argument is specified inspect the manager itself */
if (properties)
return show_properties(bus, "/org/freedesktop/login1", &new_line);
return show_properties(bus, "/org/freedesktop/login1");
return print_session_status_info(bus, "/org/freedesktop/login1/session/auto", &new_line);
return print_session_status_info(bus, "/org/freedesktop/login1/session/auto");
}
for (int i = 1; i < argc; i++) {
r = get_session_path(bus, argv[i], &error, &path);
for (int i = 1, first = true; i < argc; i++, first = false) {
_cleanup_free_ char *path = NULL;
r = get_bus_path_by_id(bus, "session", "GetSession", argv[i], &path);
if (r < 0)
return log_error_errno(r, "Failed to get session path: %s", bus_error_message(&error, r));
return r;
if (!first)
putchar('\n');
if (properties)
r = show_properties(bus, path, &new_line);
r = show_properties(bus, path);
else
r = print_session_status_info(bus, path, &new_line);
r = print_session_status_info(bus, path);
if (r < 0)
return r;
}
@ -890,8 +1004,8 @@ static int show_session(int argc, char *argv[], void *userdata) {
}
static int show_user(int argc, char *argv[], void *userdata) {
bool properties, new_line = false;
sd_bus *bus = ASSERT_PTR(userdata);
bool properties;
int r;
assert(argv);
@ -903,15 +1017,15 @@ static int show_user(int argc, char *argv[], void *userdata) {
if (argc <= 1) {
/* If no argument is specified inspect the manager itself */
if (properties)
return show_properties(bus, "/org/freedesktop/login1", &new_line);
return show_properties(bus, "/org/freedesktop/login1");
return print_user_status_info(bus, "/org/freedesktop/login1/user/self", &new_line);
return print_user_status_info(bus, "/org/freedesktop/login1/user/self");
}
for (int i = 1; i < argc; i++) {
for (int i = 1, first = true; i < argc; i++, first = false) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message * reply = NULL;
const char *path = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
const char *path;
uid_t uid;
r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL, 0);
@ -926,11 +1040,13 @@ static int show_user(int argc, char *argv[], void *userdata) {
if (r < 0)
return bus_log_parse_error(r);
if (properties)
r = show_properties(bus, path, &new_line);
else
r = print_user_status_info(bus, path, &new_line);
if (!first)
putchar('\n');
if (properties)
r = show_properties(bus, path);
else
r = print_user_status_info(bus, path);
if (r < 0)
return r;
}
@ -939,8 +1055,8 @@ static int show_user(int argc, char *argv[], void *userdata) {
}
static int show_seat(int argc, char *argv[], void *userdata) {
bool properties, new_line = false;
sd_bus *bus = ASSERT_PTR(userdata);
bool properties;
int r;
assert(argv);
@ -952,29 +1068,25 @@ static int show_seat(int argc, char *argv[], void *userdata) {
if (argc <= 1) {
/* If no argument is specified inspect the manager itself */
if (properties)
return show_properties(bus, "/org/freedesktop/login1", &new_line);
return show_properties(bus, "/org/freedesktop/login1");
return print_seat_status_info(bus, "/org/freedesktop/login1/seat/auto", &new_line);
return print_seat_status_info(bus, "/org/freedesktop/login1/seat/auto");
}
for (int i = 1; i < argc; i++) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message * reply = NULL;
const char *path = NULL;
for (int i = 1, first = true; i < argc; i++, first = false) {
_cleanup_free_ char *path = NULL;
r = bus_call_method(bus, bus_login_mgr, "GetSeat", &error, &reply, "s", argv[i]);
r = get_bus_path_by_id(bus, "seat", "GetSeat", argv[i], &path);
if (r < 0)
return log_error_errno(r, "Failed to get seat: %s", bus_error_message(&error, r));
return r;
r = sd_bus_message_read(reply, "o", &path);
if (r < 0)
return bus_log_parse_error(r);
if (!first)
putchar('\n');
if (properties)
r = show_properties(bus, path, &new_line);
r = show_properties(bus, path);
else
r = print_seat_status_info(bus, path, &new_line);
r = print_seat_status_info(bus, path);
if (r < 0)
return r;
}

4
src/shared/format-table.c
View file

@ -1586,9 +1586,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
else if (d->type == TABLE_TIMESTAMP_DATE)
ret = format_timestamp_style(p, FORMAT_TIMESTAMP_MAX, d->timestamp, TIMESTAMP_DATE);
else if (d->type == TABLE_TIMESTAMP_RELATIVE_MONOTONIC)
ret = format_timestamp_relative_full(p, FORMAT_TIMESTAMP_RELATIVE_MAX,
d->timestamp, CLOCK_MONOTONIC,
/* implicit_left = */ false);
ret = format_timestamp_relative_monotonic(p, FORMAT_TIMESTAMP_RELATIVE_MAX, d->timestamp);
else
ret = format_timestamp_relative_full(p, FORMAT_TIMESTAMP_RELATIVE_MAX,
d->timestamp, CLOCK_REALTIME,

8
src/test/test-string-util.c
View file

@ -260,6 +260,8 @@ TEST(strextend_with_separator) {
TEST(strrep) {
_cleanup_free_ char *one = NULL, *three = NULL, *zero = NULL;
char *onea, *threea;
one = strrep("waldo", 1);
three = strrep("waldo", 3);
zero = strrep("waldo", 0);
@ -267,6 +269,12 @@ TEST(strrep) {
assert_se(streq(one, "waldo"));
assert_se(streq(three, "waldowaldowaldo"));
assert_se(streq(zero, ""));
onea = strrepa("waldo", 1);
threea = strrepa("waldo", 3);
assert_se(streq(onea, "waldo"));
assert_se(streq(threea, "waldowaldowaldo"));
}
TEST(string_has_cc) {