From 2d19c17e8eafbe6c460c3cd76cf65aecd80ead87 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sun, 3 Dec 2017 18:32:53 +0100 Subject: [PATCH 1/6] udevd: list all short options in help text Signed-off-by: Marcus Folkesson --- src/udev/udevd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index e2c7f99cd4..38ced53676 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1407,13 +1407,13 @@ static void help(void) { printf("%s [OPTIONS...]\n\n" "Manages devices.\n\n" " -h --help Print this message\n" - " --version Print version of the program\n" - " --daemon Detach and run in the background\n" - " --debug Enable debug output\n" - " --children-max=INT Set maximum number of workers\n" - " --exec-delay=SECONDS Seconds to wait before executing RUN=\n" - " --event-timeout=SECONDS Seconds to wait before terminating an event\n" - " --resolve-names=early|late|never\n" + " -V --version Print version of the program\n" + " -d --daemon Detach and run in the background\n" + " -D --debug Enable debug output\n" + " -c --children-max=INT Set maximum number of workers\n" + " -e --exec-delay=SECONDS Seconds to wait before executing RUN=\n" + " -t --event-timeout=SECONDS Seconds to wait before terminating an event\n" + " -N --resolve-names=early|late|never\n" " When to resolve users and groups\n" , program_invocation_short_name); } From 73527992c1d5e5a49c8baec2ad9375e950523a57 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sun, 3 Dec 2017 18:34:54 +0100 Subject: [PATCH 2/6] udevadm-info: list all short options in help text Signed-off-by: Marcus Folkesson --- src/udev/udevadm-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index df7fbc21ae..b39f1a637e 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -250,7 +250,7 @@ static void help(void) { printf("%s info [OPTIONS] [DEVPATH|FILE]\n\n" "Query sysfs or the udev database.\n\n" " -h --help Print this message\n" - " --version Print version of the program\n" + " -V --version Print version of the program\n" " -q --query=TYPE Query device information:\n" " name Name of device node\n" " symlink Pointing to node\n" From a04a9027063119176ed20103284f99698054d45e Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sun, 3 Dec 2017 18:36:09 +0100 Subject: [PATCH 3/6] udevadm-control: list all short options in help text Signed-off-by: Marcus Folkesson --- src/udev/udevadm-control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c index 735deab252..a10621a468 100644 --- a/src/udev/udevadm-control.c +++ b/src/udev/udevadm-control.c @@ -37,7 +37,7 @@ static void print_help(void) { " -R --reload Reload rules and databases\n" " -p --property=KEY=VALUE Set a global property for all events\n" " -m --children-max=N Maximum number of children\n" - " --timeout=SECONDS Maximum time to block for a reply\n" + " -t --timeout=SECONDS Maximum time to block for a reply\n" , program_invocation_short_name); } From 0e5cba4d8deaa1e8ed73fad5b2400a146edf50e5 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sun, 3 Dec 2017 18:36:41 +0100 Subject: [PATCH 4/6] stio-bridge: list all short options in help text Signed-off-by: Marcus Folkesson --- src/stdio-bridge/stdio-bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c index e8b977e9e4..f523ff2238 100644 --- a/src/stdio-bridge/stdio-bridge.c +++ b/src/stdio-bridge/stdio-bridge.c @@ -44,7 +44,7 @@ static int help(void) { "STDIO or socket-activatable proxy to a given DBus endpoint.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " --bus-path=PATH Path to the kernel bus (default: %s)\n", + " -p --bus-path=PATH Path to the kernel bus (default: %s)\n", program_invocation_short_name, DEFAULT_BUS_PATH); return 0; From 672a008b4835fc107734b6414aa7d77fc583b773 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sun, 3 Dec 2017 18:37:10 +0100 Subject: [PATCH 5/6] journal-upload: remove duplication of --help and --version in help text Signed-off-by: Marcus Folkesson --- src/journal-remote/journal-upload.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 8137799ce8..69718aae87 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -571,8 +571,6 @@ static void help(void) { " --follow[=BOOL] Do [not] wait for input\n" " --save-state[=FILE] Save uploaded cursors (default \n" " " STATE_FILE ")\n" - " -h --help Show this help and exit\n" - " --version Print version string and exit\n" , program_invocation_short_name); } From e53fa8051dec52d467a39a908adbb0472fdad677 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Sun, 3 Dec 2017 18:38:18 +0100 Subject: [PATCH 6/6] busctl: list all short options in help text Signed-off-by: Marcus Folkesson --- src/busctl/busctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index 44110b63f9..953816c46d 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -1733,7 +1733,7 @@ static int help(void) { " --match=MATCH Only show matching messages\n" " --size=SIZE Maximum length of captured packet\n" " --list Don't show tree, but simple object path list\n" - " --quiet Don't show method call reply\n" + " -q --quiet Don't show method call reply\n" " --verbose Show result values in long format\n" " --expect-reply=BOOL Expect a method call reply\n" " --auto-start=BOOL Auto-start destination service\n"