From 719be5d34133092608f2cb4b6a8acd6cf2c403c6 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Thu, 10 Feb 2005 09:19:34 +0000
Subject: Sync program's usage() with manpage's SYNOPSIS.

---
 sbin/ping6/ping6.8 |  6 +++---
 sbin/ping6/ping6.c | 29 +++++++++++++++++------------
 2 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'sbin/ping6')

diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 686bd27..89a8168 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -68,13 +68,13 @@ packets to network hosts
 .Op Fl l Ar preload
 .Ek
 .Bk -words
-.Op Fl p Ar pattern
-.Ek
-.Bk -words
 .\" new ipsec
 .Op Fl P Ar policy
 .Ek
 .Bk -words
+.Op Fl p Ar pattern
+.Ek
+.Bk -words
 .Op Fl S Ar sourceaddr
 .Ek
 .Bk -words
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 9310088..d9c2f82 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -2702,21 +2702,26 @@ void
 usage()
 {
 	(void)fprintf(stderr,
-	    "usage: ping6 [-dfH"
+#if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)
+	    "A"
+#endif
+	    "usage: ping6 [-"
+	    "d"
+#if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC)
+	    "E"
+#endif
+	    "fH"
 #ifdef IPV6_USE_MIN_MTU
 	    "m"
 #endif
-	    "nNqtvwW"
-#ifdef IPSEC
-#ifdef IPSEC_POLICY_IPSEC
-	    "] [-P policy"
-#else
-	    "AE"
-#endif
+	    "nNqtvwW] "
+	    "[-a addrtype] [-b bufsiz] [-c count] [-g gateway]\n"
+	    "             [-h hoplimit] [-I interface] [-i wait] [-l preload]"
+#if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
+	    " [-P policy]"
 #endif
-	    "] [-a [aAclsg]] [-b sockbufsiz] [-c count] \n"
-            "\t[-I interface] [-i wait] [-l preload] [-p pattern] "
-	    "[-S sourceaddr]\n"
-            "\t[-s packetsize] [-h hoplimit] [hops...] [-g gateway] host\n");
+	    "\n"
+	    "             [-p pattern] [-S sourceaddr] [-s packetsize] "
+	    "[hops ...] host\n");
 	exit(1);
 }
-- 
cgit v1.1