shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-12 21:57:27 +03:00
Code

journalctl: properly print headers of empty journals

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-06-18 08:48:14 -04:00
parent 214daa72cb
commit 718fe4b1d5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -11,8 +11,6 @@ Bugfixes:
* properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point. * properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
* fix --header to files without entries (see test-journal output).
Fedora 19: Fedora 19:
* external: maybe it is time to patch procps so that "ps" links to * external: maybe it is time to patch procps so that "ps" links to

13
src/journal/journal-file.c
View File

@ -2270,6 +2270,15 @@ fail:
log_error("File corrupt"); log_error("File corrupt");
} }
static const char* format_timestamp_safe(char *buf, size_t l, usec_t t) {
const char *x;
x = format_timestamp(buf, l, t);
if (x)
return x;
return " --- ";
}
void journal_file_print_header(JournalFile *f) { void journal_file_print_header(JournalFile *f) {
char a[33], b[33], c[33], d[33]; char a[33], b[33], c[33], d[33];
char x[FORMAT_TIMESTAMP_MAX], y[FORMAT_TIMESTAMP_MAX], z[FORMAT_TIMESTAMP_MAX]; char x[FORMAT_TIMESTAMP_MAX], y[FORMAT_TIMESTAMP_MAX], z[FORMAT_TIMESTAMP_MAX];
@ -2317,8 +2326,8 @@ void journal_file_print_header(JournalFile *f) {
yes_no(journal_file_rotate_suggested(f, 0)), yes_no(journal_file_rotate_suggested(f, 0)),
le64toh(f->header->head_entry_seqnum), le64toh(f->header->head_entry_seqnum),
le64toh(f->header->tail_entry_seqnum), le64toh(f->header->tail_entry_seqnum),
format_timestamp(x, sizeof(x), le64toh(f->header->head_entry_realtime)), format_timestamp_safe(x, sizeof(x), le64toh(f->header->head_entry_realtime)),
format_timestamp(y, sizeof(y), le64toh(f->header->tail_entry_realtime)), format_timestamp_safe(y, sizeof(y), le64toh(f->header->tail_entry_realtime)),
format_timespan(z, sizeof(z), le64toh(f->header->tail_entry_monotonic), USEC_PER_MSEC), format_timespan(z, sizeof(z), le64toh(f->header->tail_entry_monotonic), USEC_PER_MSEC),
le64toh(f->header->n_objects), le64toh(f->header->n_objects),
le64toh(f->header->n_entries)); le64toh(f->header->n_entries));