summaryrefslogtreecommitdiff
path: root/usr.bin/elf2olf
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2007-03-15 23:06:02 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2007-03-15 23:06:02 +0000
commitd86a4b16a7931596ae7e1a85819619c41f1be287 (patch)
treeb28267d96538fbdfe1e0872bf620d53f78d53521 /usr.bin/elf2olf
parentd7435067fd3bf176848b4d283555fca5b2541ebd (diff)
simplify synopsis/usage() and sort options;
from Igor Sobrado
Diffstat (limited to 'usr.bin/elf2olf')
-rw-r--r--usr.bin/elf2olf/elf2olf.112
-rw-r--r--usr.bin/elf2olf/elf2olf.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/elf2olf/elf2olf.1 b/usr.bin/elf2olf/elf2olf.1
index eb8d65e87a5..b4db67e2ddb 100644
--- a/usr.bin/elf2olf/elf2olf.1
+++ b/usr.bin/elf2olf/elf2olf.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: elf2olf.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
+.\" $OpenBSD: elf2olf.1,v 1.14 2007/03/15 23:06:01 jmc Exp $
.\"
.\" Copyright (c) 1996, 1997 Erik Theisen.
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" @(#)$Id: elf2olf.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
+.\" @(#)$Id: elf2olf.1,v 1.14 2007/03/15 23:06:01 jmc Exp $
.\"
.Dd May 5, 1997
.Dt ELF2OLF 1
@@ -38,10 +38,10 @@
.Nm elf2olf
.Op Fl v
.Op Fl o Ar opsys
-.Ar module Op Ar ...
+.Ar module ...
.Nm olf2elf
.Op Fl v
-.Ar file Op Ar ...
+.Ar
.Sh DESCRIPTION
The
.Nm elf2olf
@@ -60,8 +60,6 @@ operands are processed in command line order.
.Pp
The options are as follows:
.Bl -tag -width Ds
-.It Fl v
-Operate in verbose mode.
.It Fl o Ar opsys
Specifies the operating system
.Em OLF
@@ -83,6 +81,8 @@ as follows:
.It Ta Pa "dell" Ta "Dell SVR4"
.It Ta Pa "ncr " Ta "NCR SVR4"
.El
+.It Fl v
+Operate in verbose mode.
.El
.Pp
The
diff --git a/usr.bin/elf2olf/elf2olf.c b/usr.bin/elf2olf/elf2olf.c
index 5e2d875d438..b2a0cad4a6e 100644
--- a/usr.bin/elf2olf/elf2olf.c
+++ b/usr.bin/elf2olf/elf2olf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elf2olf.c,v 1.8 2006/03/22 13:25:58 ray Exp $ */
+/* $OpenBSD: elf2olf.c,v 1.9 2007/03/15 23:06:01 jmc Exp $ */
/*
* Copyright (c) 1996 Erik Theisen. All rights reserved.
*
@@ -30,7 +30,7 @@ static char copyright[] =
#endif /* not lint */
#ifndef lint
-static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.8 2006/03/22 13:25:58 ray Exp $";
+static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.9 2007/03/15 23:06:01 jmc Exp $";
#endif
#include <stdlib.h>
@@ -244,7 +244,7 @@ usage(void)
if (olf2elf) {
fprintf(stderr, "usage: %s [-v] file ...\n", progname);
} else {
- fprintf(stderr, "usage: %s [-v] [-o opsys] elffile ...\n", progname);
+ fprintf(stderr, "usage: %s [-v] [-o opsys] module ...\n", progname);
fprintf(stderr, "where opsys is:\n\t");
for (i = 1; os_namev[i] != NULL; i++) {
col = col + strlen(os_namev[i]) + 2;