[src/trunk]: src/usr.bin/mkubootimage Sync usage with man page, merge single ...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/642c3a4d3bfc
branches:  trunk
changeset: 967380:642c3a4d3bfc
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sat Dec 07 12:34:17 2019 +0000

description:
Sync usage with man page, merge single letter options.

Limit program usage line length.

diffstat:

 usr.bin/mkubootimage/mkubootimage.1 |  11 +++++------
 usr.bin/mkubootimage/mkubootimage.c |  18 ++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diffs (85 lines):

diff -r 2506e14fd266 -r 642c3a4d3bfc usr.bin/mkubootimage/mkubootimage.1
--- a/usr.bin/mkubootimage/mkubootimage.1       Sat Dec 07 12:22:19 2019 +0000
+++ b/usr.bin/mkubootimage/mkubootimage.1       Sat Dec 07 12:34:17 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: mkubootimage.1,v 1.13 2019/12/04 11:21:34 jmcneill Exp $
+.\"    $NetBSD: mkubootimage.1,v 1.14 2019/12/07 12:34:17 wiz Exp $
 .\"
 .\" Copyright (c) 2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .Nd create U-Boot loader image
 .Sh SYNOPSIS
 .Nm
-.Op Fl h
+.Op Fl hu
 .Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc Ns | Ns sh )
 .Fl a Ar address
 .Op Fl C Po bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none Pc
@@ -45,8 +45,7 @@
 .Op Fl m Ar magic
 .Fl n Ar image
 .Op Fl O Po freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd Pc
-.Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns standalone )
-.Op Fl u
+.Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
 .Ar source destination
 .\"
 .Sh DESCRIPTION
@@ -59,7 +58,7 @@
 .Bl -tag -width indent
 .It Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc Ns | Ns sh )
 Defines the architecture.
-This is required for 
+This is required for
 .Qq uimg
 format images.
 .It Fl a Ar address
@@ -120,7 +119,7 @@
 Defines the operating system type.
 The default OS name is
 .Qq netbsd .
-.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns standalone Ns | Ns script )
+.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
 Defines the image type.
 This is required for
 .Qq uimg
diff -r 2506e14fd266 -r 642c3a4d3bfc usr.bin/mkubootimage/mkubootimage.c
--- a/usr.bin/mkubootimage/mkubootimage.c       Sat Dec 07 12:22:19 2019 +0000
+++ b/usr.bin/mkubootimage/mkubootimage.c       Sat Dec 07 12:34:17 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.26 2019/12/04 14:09:47 jmcneill Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.26 2019/12/04 14:09:47 jmcneill Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $");
 
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -264,14 +264,12 @@
 __dead static void
 usage(void)
 {
-       fprintf(stderr, "usage: mkubootimage -A "
-           "<arm|arm64|i386|mips|mips64|or1k|powerpc|sh>");
-       fprintf(stderr, " -C <none|bz2|gz|lzma|lzo>");
-       fprintf(stderr, " -O <openbsd|netbsd|freebsd|linux>");
-       fprintf(stderr, " -T <standalone|kernel|kernel_noload|ramdisk|fs|script>");
-       fprintf(stderr, " -a <addr> [-e <ep>] [-m <magic>] -n <name>");
-       fprintf(stderr, " [-f <uimg|arm64>] [-u]");
-       fprintf(stderr, " <srcfile> <dstfile>\n");
+       fprintf(stderr, "usage: mkubootimage [-hu] -A "
+           "<arm|arm64|i386|mips|mips64|or1k|powerpc|sh> -a address\n");
+       fprintf(stderr, "\t-C <bz2|gz|lzma|lzo|none> [-E address] [-e address]\n");
+       fprintf(stderr, "\t[-f <arm64|uimg>] [-m magic] -n image -O <freebsd|linux|netbsd|openbsd>\n");
+       fprintf(stderr, "\t-T <fs|kernel|kernel_noload|ramdisk|script|standalone>\n");
+       fprintf(stderr, "\tsource destination\n");
 
        exit(EXIT_FAILURE);
 }