|
 |
951ecb |
From 46201f029e4a5ac3ba0aaf05cb6df80341729566 Mon Sep 17 00:00:00 2001
|
|
|
951ecb |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
951ecb |
Date: Mon, 30 Jul 2018 14:17:49 -0500
|
|
|
951ecb |
Subject: [PATCH] Doc: tools: add --help/--version options to ipmiservicelogd
|
|
|
951ecb |
|
|
|
951ecb |
allows ppc64le build when relevant dependencies are installed
|
|
|
951ecb |
---
|
|
|
951ecb |
tools/ipmiservicelogd.c | 16 ++++++++++++++--
|
|
|
951ecb |
1 file changed, 14 insertions(+), 2 deletions(-)
|
|
|
951ecb |
|
|
|
951ecb |
diff --git a/tools/ipmiservicelogd.c b/tools/ipmiservicelogd.c
|
|
|
951ecb |
index 4f52865..865eae0 100644
|
|
|
951ecb |
--- a/tools/ipmiservicelogd.c
|
|
|
951ecb |
+++ b/tools/ipmiservicelogd.c
|
|
|
951ecb |
@@ -253,7 +253,7 @@ getProductName(void)
|
|
|
951ecb |
static void
|
|
|
951ecb |
con_usage(const char *name, const char *help, void *cb_data)
|
|
|
951ecb |
{
|
|
|
951ecb |
- printf("\n%s%s", name, help);
|
|
|
951ecb |
+ printf("%s\n", help);
|
|
|
951ecb |
}
|
|
|
951ecb |
|
|
|
951ecb |
static void
|
|
|
951ecb |
@@ -261,7 +261,7 @@ usage(const char *progname)
|
|
|
951ecb |
{
|
|
|
951ecb |
printf("Usage:\n");
|
|
|
951ecb |
printf(" %s <con_parms>\n", progname);
|
|
|
951ecb |
- printf(" Where <con_parms> is one of:");
|
|
|
951ecb |
+ printf(" Where <con_parms> is one of:\n");
|
|
|
951ecb |
ipmi_parse_args_iter_help(con_usage, NULL);
|
|
|
951ecb |
}
|
|
|
951ecb |
|
|
|
951ecb |
@@ -550,6 +550,18 @@ main(int argc, char *argv[])
|
|
|
951ecb |
/* Initialize the OpenIPMI library. */
|
|
|
951ecb |
ipmi_init(os_hnd);
|
|
|
951ecb |
|
|
|
951ecb |
+ // Check for pacemaker-standard help and version options
|
|
|
951ecb |
+ if (argc > 1) {
|
|
|
951ecb |
+ for (char **arg = &argv[1]; *arg != NULL; ++arg) {
|
|
|
951ecb |
+ if (!strcmp(*arg, "--help") || !strcmp(*arg, "-?")) {
|
|
|
951ecb |
+ usage(argv[0]);
|
|
|
951ecb |
+ return 0;
|
|
|
951ecb |
+ } else if (!strcmp(*arg, "--version") || !strcmp(*arg, "-$")) {
|
|
|
951ecb |
+ crm_help('$', 0);
|
|
|
951ecb |
+ }
|
|
|
951ecb |
+ }
|
|
|
951ecb |
+ }
|
|
|
951ecb |
+
|
|
|
951ecb |
#ifdef COMPLEX
|
|
|
951ecb |
rv = ipmi_parse_args2(&curr_arg, argc, argv, &args);
|
|
|
951ecb |
if (rv) {
|
|
|
951ecb |
--
|
|
|
951ecb |
1.8.3.1
|
|
|
951ecb |
|