chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: properly initialize column widths for list-jobs
[elogind.git]
/
src
/
systemctl
/
systemctl.c
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index 73fdbdbed6b6e6dda16ea307e0fd40c69a0c058b..63800864ad8fe9e08c3aefe236a6fa9694ad3aed 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-532,7
+532,7
@@
static int get_triggered_units(
static int get_listening(
sd_bus *bus,
const char* unit_path,
static int get_listening(
sd_bus *bus,
const char* unit_path,
- char*** listen,
+ char*** listen
ing
,
unsigned *c) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
unsigned *c) {
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
@@
-560,11
+560,11
@@
static int get_listening(
while ((r = sd_bus_message_read(reply, "(ss)", &type, &path)) > 0) {
while ((r = sd_bus_message_read(reply, "(ss)", &type, &path)) > 0) {
- r = strv_extend(listen, type);
+ r = strv_extend(listen
ing
, type);
if (r < 0)
return log_oom();
if (r < 0)
return log_oom();
- r = strv_extend(listen, path);
+ r = strv_extend(listen
ing
, path);
if (r < 0)
return log_oom();
if (r < 0)
return log_oom();
@@
-687,7
+687,7
@@
static int list_sockets(sd_bus *bus, char **args) {
cu = (unsigned) r;
for (u = unit_infos; u < unit_infos + cu; u++) {
cu = (unsigned) r;
for (u = unit_infos; u < unit_infos + cu; u++) {
- _cleanup_strv_free_ char **listen = NULL, **triggered = NULL;
+ _cleanup_strv_free_ char **listen
ing
= NULL, **triggered = NULL;
unsigned c = 0, i;
if (!output_show_unit(u))
unsigned c = 0, i;
if (!output_show_unit(u))
@@
-700,7
+700,7
@@
static int list_sockets(sd_bus *bus, char **args) {
if (r < 0)
goto cleanup;
if (r < 0)
goto cleanup;
- r = get_listening(bus, u->unit_path, &listen, &c);
+ r = get_listening(bus, u->unit_path, &listen
ing
, &c);
if (r < 0)
goto cleanup;
if (r < 0)
goto cleanup;
@@
-712,16
+712,16
@@
static int list_sockets(sd_bus *bus, char **args) {
for (i = 0; i < c; i++)
socket_infos[cs + i] = (struct socket_info) {
.id = u->id,
for (i = 0; i < c; i++)
socket_infos[cs + i] = (struct socket_info) {
.id = u->id,
- .type = listen[i*2],
- .path = listen[i*2 + 1],
+ .type = listen
ing
[i*2],
+ .path = listen
ing
[i*2 + 1],
.triggered = triggered,
.own_triggered = i==0,
};
/* from this point on we will cleanup those socket_infos */
cs += c;
.triggered = triggered,
.own_triggered = i==0,
};
/* from this point on we will cleanup those socket_infos */
cs += c;
- free(listen);
- listen = triggered = NULL; /* avoid cleanup */
+ free(listen
ing
);
+ listen
ing
= triggered = NULL; /* avoid cleanup */
}
qsort_safe(socket_infos, cs, sizeof(struct socket_info),
}
qsort_safe(socket_infos, cs, sizeof(struct socket_info),
@@
-1204,7
+1204,11
@@
static void output_jobs_list(const struct job_info* jobs, unsigned n) {
pager_open_if_enabled();
pager_open_if_enabled();
- id_len = unit_len = type_len = state_len = 0;
+ id_len = sizeof("JOB")-1;
+ unit_len = sizeof("UNIT")-1;
+ type_len = sizeof("TYPE")-1;
+ state_len = sizeof("STATE")-1;
+
for (j = jobs; j < jobs + n; j++) {
uint32_t id = j->id;
assert(j->name && j->type && j->state);
for (j = jobs; j < jobs + n; j++) {
uint32_t id = j->id;
assert(j->name && j->type && j->state);
@@
-1936,11
+1940,11
@@
static int check_inhibitors(sd_bus *bus, enum action a) {
/* If logind is not around, then there are no inhibitors... */
return 0;
/* If logind is not around, then there are no inhibitors... */
return 0;
- r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "
ssssuu
");
+ r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "
(ssssuu)
");
if (r < 0)
return bus_log_parse_error(r);
if (r < 0)
return bus_log_parse_error(r);
- while ((r = sd_bus_message_read(reply, "
ssssuu
", &what, &who, &why, &mode, &uid, &pid)) > 0) {
+ while ((r = sd_bus_message_read(reply, "
(ssssuu)
", &what, &who, &why, &mode, &uid, &pid)) > 0) {
_cleanup_free_ char *comm = NULL, *user = NULL;
_cleanup_strv_free_ char **sv = NULL;
_cleanup_free_ char *comm = NULL, *user = NULL;
_cleanup_strv_free_ char **sv = NULL;