diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-10-18 23:22:56 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-10-18 23:35:44 +0200 |
| commit | cd4b13e0bfe9281a0d2c0c3bef1c589d0684950b (patch) | |
| tree | 85f4cff3e191552956243ce630fcd8ca340b3996 | |
| parent | fd6e88753716d8136037277c7db2196e0f979675 (diff) | |
journalctl: don't ellipsize unless on a tty
| -rw-r--r-- | src/journal/journalctl.c | 14 | ||||
| -rw-r--r-- | src/shared/logs-show.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 7564c48e1f..5185b4b398 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -57,7 +57,7 @@ static OutputMode arg_output = OUTPUT_SHORT; static bool arg_follow = false; -static bool arg_show_all = false; +static bool arg_all = false; static bool arg_no_pager = false; static unsigned arg_lines = 0; static bool arg_no_tail = false; @@ -87,15 +87,15 @@ static enum { static int help(void) { - printf("%s [OPTIONS...] [MATCH]\n\n" + printf("%s [OPTIONS...] [MATCHES...]\n\n" "Query the journal.\n\n" "Flags:\n" - " -c --cursor=CURSOR Start showing entries from specified cursor\n" " --since=DATE Start showing entries newer or of the specified date\n" " --until=DATE Stop showing entries older or of the specified date\n" + " -c --cursor=CURSOR Start showing entries from specified cursor\n" " -b --this-boot Show data only from current boot\n" " -u --unit=UNIT Show data only from the specified unit\n" - " -p --priority=RANGE Show only messages within the specified priority range\n\n" + " -p --priority=RANGE Show only messages within the specified priority range\n" " -f --follow Follow journal\n" " -n --lines[=INTEGER] Number of journal entries to show\n" " --no-tail Show all lines, even in follow mode\n" @@ -217,7 +217,7 @@ static int parse_argv(int argc, char *argv[]) { break; case 'a': - arg_show_all = true; + arg_all = true; break; case 'n': @@ -1047,8 +1047,8 @@ int main(int argc, char *argv[]) { } flags = - arg_show_all * OUTPUT_SHOW_ALL | - have_pager * OUTPUT_FULL_WIDTH | + arg_all * OUTPUT_SHOW_ALL | + (!on_tty() || have_pager) * OUTPUT_FULL_WIDTH | on_tty() * OUTPUT_COLOR; r = output_journal(stdout, j, arg_output, 0, flags); diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 05895366e2..63a48e4552 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -243,7 +243,7 @@ static int output_short( } } - if (flags) + if (flags & OUTPUT_SHOW_ALL) fprintf(f, ": %s%.*s%s\n", color_on, (int) message_len, message, color_off); else if (!utf8_is_printable_n(message, message_len)) { char bytes[FORMAT_BYTES_MAX]; |