naccyde / rpms / iproute

Forked from rpms/iproute 9 months ago
Clone
Blob Blame History Raw
From 83af05569ffb9d607438f93d98c5ead84b1cc5ac Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Thu, 13 Sep 2018 20:38:04 +0200
Subject: [PATCH] genl: Fix help text

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1612704
Upstream Status: iproute2.git commit d94974bc91eb2

commit d94974bc91eb2aa2df4592140e1aa3ea0d3cddba
Author: Phil Sutter <phil@nwl.cc>
Date:   Thu Aug 16 12:27:57 2018 +0200

    genl: Fix help text

    The '| help' part was misleading: In fact, 'genl help' does not work but
    'genl <OBJECT> help' does. Fix the help text to make that clear.

    In addition to that, list -Version and -help flags as well.

    Signed-off-by: Phil Sutter <phil@nwl.cc>
    Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 genl/genl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/genl/genl.c b/genl/genl.c
index 20ecb8b..1940a23 100644
--- a/genl/genl.c
+++ b/genl/genl.c
@@ -98,9 +98,9 @@ static void usage(void) __attribute__((noreturn));
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: genl [ OPTIONS ] OBJECT | help }\n"
+	fprintf(stderr, "Usage: genl [ OPTIONS ] OBJECT [help] }\n"
 	                "where  OBJECT := { ctrl etc }\n"
-	                "       OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] }\n");
+	                "       OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -V[ersion] | -h[elp] }\n");
 	exit(-1);
 }
 
-- 
1.8.3.1