From 94e0bd7db1d7ca8ab7f738cdab1d014241f5b225 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 3 Aug 2013 19:38:13 -0400 Subject: systemctl: show hint about --full when lines don't fit --- src/journal/journal-gatewayd.c | 2 +- src/journal/journalctl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/journal') diff --git a/src/journal/journal-gatewayd.c b/src/journal/journal-gatewayd.c index 10224a1ac1..06a236df6b 100644 --- a/src/journal/journal-gatewayd.c +++ b/src/journal/journal-gatewayd.c @@ -248,7 +248,7 @@ static ssize_t request_reader_entries( } } - r = output_journal(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH); + r = output_journal(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH, NULL); if (r < 0) { log_error("Failed to serialize item: %s", strerror(-r)); return MHD_CONTENT_READER_END_WITH_ERROR; diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index feea6bf19e..5cf9390249 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1305,6 +1305,7 @@ int main(int argc, char *argv[]) { sd_id128_t previous_boot_id; bool previous_boot_id_valid = false, first_line = true; int n_shown = 0; + bool ellipsized = false; setlocale(LC_ALL, ""); log_parse_environment(); @@ -1624,7 +1625,7 @@ int main(int argc, char *argv[]) { on_tty() * OUTPUT_COLOR | arg_catalog * OUTPUT_CATALOG; - r = output_journal(stdout, j, arg_output, 0, flags); + r = output_journal(stdout, j, arg_output, 0, flags, &ellipsized); need_seek = true; if (r == -EADDRNOTAVAIL) break; -- cgit v1.2.3-54-g00ecf