diff options
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journalctl.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 816934ee6b..feb53bd203 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -127,6 +127,14 @@ static void pager_open_if_enabled(void) { pager_open(arg_pager_end); } +static char *format_timestamp_maybe_utc(char *buf, size_t l, usec_t t) { + + if (arg_utc) + return format_timestamp_utc(buf, l, t); + + return format_timestamp(buf, l, t); +} + static int parse_boot_descriptor(const char *x, sd_id128_t *boot_id, int *offset) { sd_id128_t id = SD_ID128_NULL; int off = 0, r; @@ -890,8 +898,8 @@ static int list_boots(sd_journal *j) { printf("% *i " SD_ID128_FORMAT_STR " %s—%s\n", w, i - count + 1, SD_ID128_FORMAT_VAL(id->id), - format_timestamp_internal(a, sizeof(a), id->first, arg_utc), - format_timestamp_internal(b, sizeof(b), id->last, arg_utc)); + format_timestamp_maybe_utc(a, sizeof(a), id->first), + format_timestamp_maybe_utc(b, sizeof(b), id->last)); } return 0; @@ -1502,8 +1510,8 @@ static int verify(sd_journal *j) { if (arg_verify_key && JOURNAL_HEADER_SEALED(f->header)) { if (validated > 0) { log_info("=> Validated from %s to %s, final %s entries not sealed.", - format_timestamp_internal(a, sizeof(a), first, arg_utc), - format_timestamp_internal(b, sizeof(b), validated, arg_utc), + format_timestamp_maybe_utc(a, sizeof(a), first), + format_timestamp_maybe_utc(b, sizeof(b), validated), format_timespan(c, sizeof(c), last > validated ? last - validated : 0, 0)); } else if (last > 0) log_info("=> No sealing yet, %s of entries not sealed.", @@ -1898,11 +1906,11 @@ int main(int argc, char *argv[]) { if (r > 0) { if (arg_follow) printf("-- Logs begin at %s. --\n", - format_timestamp_internal(start_buf, sizeof(start_buf), start, arg_utc)); + format_timestamp_maybe_utc(start_buf, sizeof(start_buf), start)); else printf("-- Logs begin at %s, end at %s. --\n", - format_timestamp_internal(start_buf, sizeof(start_buf), start, arg_utc), - format_timestamp_internal(end_buf, sizeof(end_buf), end, arg_utc)); + format_timestamp_maybe_utc(start_buf, sizeof(start_buf), start), + format_timestamp_maybe_utc(end_buf, sizeof(end_buf), end)); } } |