From 4313b99136dcab00fd00624fdce2306562d8bf6f Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Mon, 11 Mar 2024 13:56:30 +0100 Subject: [PATCH] shared/service-util: actually use the `bus_introspect` argument in `help()` If `bus_introspect` is false, do not print the `--bus-introspect=PATH` option. Also, modernize help output. --- src/shared/service-util.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/shared/service-util.c b/src/shared/service-util.c index a415d54084a..7d46ee7a660 100644 --- a/src/shared/service-util.c +++ b/src/shared/service-util.c @@ -17,21 +17,22 @@ static int help(const char *program_path, const char *service, const char *descr if (r < 0) return log_oom(); - printf("%s [OPTIONS...]\n\n" - "%s%s%s\n\n" - "This program takes no positional arguments.\n\n" - "%sOptions%s:\n" + printf("%1$s [OPTIONS...]\n" + "\n%5$s%7$s%6$s\n" + "\nThis program takes no positional arguments.\n" + "\n%3$sOptions:%4$s\n" " -h --help Show this help\n" " --version Show package version\n" - " --bus-introspect=PATH Write D-Bus XML introspection data\n" - "\nSee the %s for details.\n", + "%8$s" + "\nSee the %2$s for details.\n", program_path, - ansi_highlight(), - description, - ansi_normal(), + link, ansi_underline(), ansi_normal(), - link); + ansi_highlight(), + ansi_normal(), + description, + bus_introspect ? " --bus-introspect=PATH Write D-Bus XML introspection data\n" : ""); return 0; /* No further action */ } -- 2.47.3