diff options
| -rw-r--r-- | man/journalctl.xml | 15 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 12 |
2 files changed, 21 insertions, 6 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml index b5a0c539ca..2ce81a0563 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -152,11 +152,20 @@ </varlistentry> <varlistentry> - <term><option>-l</option></term> + <term><option>--no-full</option></term> <term><option>--full</option></term> + <term><option>-l</option></term> + + <listitem><para>Ellipsize fields when + they don't fit in available columns. + The default is to show full fields, + allowing them to wrap or be truncated + by the pager if one is used.</para> - <listitem><para>Show all (printable) fields in - full.</para></listitem> + <para>Old options + <option>-l</option>/<option>--full</option> + not useful anymore, except to undo + <option>--no-full</option>.</para></listitem> </varlistentry> <varlistentry> diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 9a2d255361..2f8be1b83e 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -64,7 +64,7 @@ static OutputMode arg_output = OUTPUT_SHORT; static bool arg_pager_end = false; static bool arg_follow = false; -static bool arg_full = false; +static bool arg_full = true; static bool arg_all = false; static bool arg_no_pager = false; static int arg_lines = -1; @@ -138,7 +138,7 @@ static int help(void) { " short-precise, short-monotonic, verbose,\n" " export, json, json-pretty, json-sse, cat)\n" " -x --catalog Add message explanations where available\n" - " -l --full Do not ellipsize fields\n" + " --no-full Ellipsize fields\n" " -a --all Show all fields, including long and unprintable\n" " -q --quiet Don't show privilege warning\n" " --no-pager Do not pipe output into a pager\n" @@ -175,6 +175,7 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_NO_PAGER, + ARG_NO_FULL, ARG_NO_TAIL, ARG_NEW_ID128, ARG_USER, @@ -208,6 +209,7 @@ static int parse_argv(int argc, char *argv[]) { { "output", required_argument, NULL, 'o' }, { "all", no_argument, NULL, 'a' }, { "full", no_argument, NULL, 'l' }, + { "no-full", no_argument, NULL, ARG_NO_FULL }, { "lines", optional_argument, NULL, 'n' }, { "no-tail", no_argument, NULL, ARG_NO_TAIL }, { "new-id128", no_argument, NULL, ARG_NEW_ID128 }, @@ -298,6 +300,10 @@ static int parse_argv(int argc, char *argv[]) { arg_full = true; break; + case ARG_NO_FULL: + arg_full = false; + break; + case 'a': arg_all = true; break; @@ -1622,7 +1628,7 @@ int main(int argc, char *argv[]) { flags = arg_all * OUTPUT_SHOW_ALL | - (arg_full || !on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | + arg_full * OUTPUT_FULL_WIDTH | on_tty() * OUTPUT_COLOR | arg_catalog * OUTPUT_CATALOG; |