From 97c034d4986b8fde160ceecd53d2bc3ee85410e4 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@cvs.openbsd.org>
Date: Fri, 25 Sep 2015 16:23:19 +0000
Subject: add missing .Ar macro and simplify synopsis

---
 usr.bin/getcap/getcap.1 | 13 +++----------
 usr.bin/getcap/getcap.c |  9 +++++----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/usr.bin/getcap/getcap.1 b/usr.bin/getcap/getcap.1
index 2eeca022629..49fc4bd8e48 100644
--- a/usr.bin/getcap/getcap.1
+++ b/usr.bin/getcap/getcap.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.1,v 1.3 2007/05/31 19:20:10 jmc Exp $
+.\"	$OpenBSD: getcap.1,v 1.4 2015/09/25 16:23:18 schwarze Exp $
 .\"
 .\" Copyright (c) 2005 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 25 2015 $
 .Dt GETCAP 1
 .Os
 .Sh NAME
@@ -26,15 +26,8 @@
 .Fl b Ar boolean | Fl c Ar capability |
 .Fl n Ar number | Fl s Ar string
 .Oc
-.Fl a
 .Fl f Ar path
-.Nm getcap
-.Oo
-.Fl b Ar boolean | Fl c Ar capability |
-.Fl n Ar number | Fl s Ar string
-.Oc
-.Fl f Ar path
-record ...
+.Fl a | Ar record ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.bin/getcap/getcap.c b/usr.bin/getcap/getcap.c
index df71e8f9860..c2821571dcd 100644
--- a/usr.bin/getcap/getcap.c
+++ b/usr.bin/getcap/getcap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getcap.c,v 1.4 2013/11/15 22:20:04 millert Exp $	*/
+/*	$OpenBSD: getcap.c,v 1.5 2015/09/25 16:23:18 schwarze Exp $	*/
 
 /*
  * Copyright (c) 2005 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -172,8 +172,9 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-b boolean | -c capability | -n number | -s string] -a -f path\n"
-	    "       %s [-b boolean | -c capability | -n number | -s string] -f path record ...\n",
-	    __progname, __progname);
+	fprintf(stderr, "usage: %s [-b boolean | -c capability | "
+	    "-n number | -s string] -f path\n"
+	    "              -a | record ...\n",
+	    __progname);
 	exit(1);
 }
-- 
cgit v1.2.3