From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Nov 2019 09:50:49 +0000 (+0100)
Subject: journalctl: underline sections in --help
X-Git-Tag: v245-rc1~41^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23d8c56046f189b0c1791b5b8611a93dda39effe;p=thirdparty%2Fsystemd.git

journalctl: underline sections in --help
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index f5d208edcdd..4e2a8f6d118 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -313,9 +313,9 @@ static int help(void) {
         if (r < 0)
                 return log_oom();
 
-        printf("%s [OPTIONS...] [MATCHES...]\n\n"
-               "%sQuery the journal.%s\n\n"
-               "Options:\n"
+        printf("%1$s [OPTIONS...] [MATCHES...]\n\n"
+               "%5$sQuery the journal.%6$s\n\n"
+               "%3$sOptions:%4$s\n"
                "     --system                Show the system journal\n"
                "     --user                  Show the user journal for the current user\n"
                "  -M --machine=CONTAINER     Operate on local container\n"
@@ -360,7 +360,7 @@ static int help(void) {
                "     --interval=TIME         Time interval for changing the FSS sealing key\n"
                "     --verify-key=KEY        Specify FSS verification key\n"
                "     --force                 Override of the FSS key pair with --setup-keys\n"
-               "\nCommands:\n"
+               "\n%3$sCommands:%4$s\n"
                "  -h --help                  Show this help text\n"
                "     --version               Show package version\n"
                "  -N --fields                List all field names currently used\n"
@@ -380,10 +380,11 @@ static int help(void) {
                "     --dump-catalog          Show entries in the message catalog\n"
                "     --update-catalog        Update the message catalog database\n"
                "     --setup-keys            Generate a new FSS key pair\n"
-               "\nSee the %s for details.\n"
+               "\nSee the %2$s for details.\n"
                , program_invocation_short_name
-               , ansi_highlight(), ansi_normal()
                , link
+               , ansi_underline(), ansi_normal()
+               , ansi_highlight(), ansi_normal()
         );
 
         return 0;