[iproute2] ip: cleanup help message

Commit Message

Stephen Hemminger March 18, 2021, 12:15 a.m. UTC

Wrap help message text at 80 characters, and put list of things
in alpha order.

Signed-off-by: Stephen Hemminger <[e-mail]>
---
Other places may need this as well.

PS: I made a version that auto-generated the text but it was too verbose
especially since many options in iproute2 are dynamically bound.

 ip/ip.c     |  9 +++++----
 ip/iplink.c | 11 +++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

Patch

diff --git a/ip/ip.c b/ip/ip.c
index 40d2998ae60b..6781443014d7 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -64,10 +64,11 @@  static void usage(void)
 	fprintf(stderr,
 		"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
 		"       ip [ -force ] -batch filename\n"
-		"where  OBJECT := { link | address | addrlabel | route | rule | neigh | ntable |\n"
-		"                   tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n"
-		"                   netns | l2tp | fou | macsec | tcp_metrics | token | netconf | ila |\n"
-		"                   vrf | sr | nexthop | mptcp }\n"
+		"where  OBJECT := { address | addrlabel | fou | help | ila | l2tp | link |\n"
+		"                   macsec | maddress | monitor | mptcp | mroute | mrule |\n"
+		"                   neighbor | neighbour | netconf | netns | nexthop | ntable |\n"
+		"                   ntbl | route | rule | sr | tap | tcp_metrics | tcpmetrics |\n"
+		"                   token | tunl | tunnel | tuntap | vrf | xfrm }\n"
 		"       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
 		"                    -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
 		"                    -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
diff --git a/ip/iplink.c b/ip/iplink.c
index 27c9be442a7a..10eab97ebea2 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -118,12 +118,11 @@  void iplink_usage(void)
 			"\n"
 			"	ip link help [ TYPE ]\n"
 			"\n"
-			"TYPE := { vlan | veth | vcan | vxcan | dummy | ifb | macvlan | macvtap |\n"
-			"	   bridge | bond | team | ipoib | ip6tnl | ipip | sit | vxlan |\n"
-			"	   gre | gretap | erspan | ip6gre | ip6gretap | ip6erspan |\n"
-			"	   vti | nlmon | team_slave | bond_slave | bridge_slave |\n"
-			"	   ipvlan | ipvtap | geneve | bareudp | vrf | macsec | netdevsim | rmnet |\n"
-			"	   xfrm }\n");
+			"TYPE := { bareudp | bond | bond_slave | bridge |bridge_slave | dummy | erspan |\n"
+			"          geneve | gre | gretap | ifb | ip6erspan | ip6gre | ip6gretap | ip6tnl |\n"
+			"          ipip | ipoib | ipvlan | ipvtap | macsec | macvlan | macvtap |\n"
+			"          netdevsim| nlmon | rmnet |sit| team| | team_slave | vcan | veth |\n"
+			"          vlan | vrf | vti | vxcan | vxlan | xfrm }\n");
 	}
 	exit(-1);
 }