#include "alloc-util.h"
#include "bus-error.h"
-#include "bus-unit-util.h"
+#include "bus-unit-procs.h"
#include "bus-util.h"
#include "cgroup-show.h"
#include "cgroup-util.h"
#include "logs-show.h"
#include "macro.h"
#include "main-func.h"
+#include "memory-util.h"
#include "pager.h"
#include "parse-util.h"
#include "pretty-print.h"
#include "terminal-util.h"
#include "unit-name.h"
#include "user-util.h"
-#include "util.h"
#include "verbs.h"
static char **arg_property = NULL;
assert(table);
assert(word);
- if (table_get_rows(table) > 1) {
+ if (table_get_rows(table) > 1 || OUTPUT_MODE_IS_JSON(arg_output)) {
r = table_set_sort(table, (size_t) 0, (size_t) -1);
if (r < 0)
return log_error_errno(r, "Failed to sort table: %m");
return bus_log_parse_error(r);
if (all || !isempty(s))
- bus_print_property_value(name, expected_value, value, "%s", s);
+ bus_print_property_value(name, expected_value, value, s);
return 1;
"Invalid user ID: " UID_FMT,
uid);
- bus_print_property_value(name, expected_value, value, UID_FMT, uid);
+ bus_print_property_valuef(name, expected_value, value, UID_FMT, uid);
return 1;
}
break;
int r;
setlocale(LC_ALL, "");
+ log_show_color(true);
log_parse_environment();
log_open();