diff options
Diffstat (limited to 'tools/bpf/bpftool/prog.c')
-rw-r--r-- | tools/bpf/bpftool/prog.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index e71a0a11afde..9bdfdf2d3fbe 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c | |||
@@ -96,7 +96,10 @@ static void print_boot_time(__u64 nsecs, char *buf, unsigned int size) | |||
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | 98 | ||
99 | strftime(buf, size, "%b %d/%H:%M", &load_tm); | 99 | if (json_output) |
100 | strftime(buf, size, "%s", &load_tm); | ||
101 | else | ||
102 | strftime(buf, size, "%FT%T%z", &load_tm); | ||
100 | } | 103 | } |
101 | 104 | ||
102 | static int prog_fd_by_tag(unsigned char *tag) | 105 | static int prog_fd_by_tag(unsigned char *tag) |
@@ -245,7 +248,8 @@ static void print_prog_json(struct bpf_prog_info *info, int fd) | |||
245 | print_boot_time(info->load_time, buf, sizeof(buf)); | 248 | print_boot_time(info->load_time, buf, sizeof(buf)); |
246 | 249 | ||
247 | /* Piggy back on load_time, since 0 uid is a valid one */ | 250 | /* Piggy back on load_time, since 0 uid is a valid one */ |
248 | jsonw_string_field(json_wtr, "loaded_at", buf); | 251 | jsonw_name(json_wtr, "loaded_at"); |
252 | jsonw_printf(json_wtr, "%s", buf); | ||
249 | jsonw_uint_field(json_wtr, "uid", info->created_by_uid); | 253 | jsonw_uint_field(json_wtr, "uid", info->created_by_uid); |
250 | } | 254 | } |
251 | 255 | ||