From b0cd659a30f569c43dbe10633b568ee055db2a80 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 26 Jun 2021 15:42:58 +0000
Subject: [PATCH] delete extra explanations in the usage: messages which are
 described far better in the manual pages ok jmc

---
 bin/chio/chio.c                  |  6 +-----
 sbin/newfs_ext2fs/newfs_ext2fs.c | 23 +----------------------
 sbin/route/route.c               |  5 +----
 usr.sbin/map-mbone/mapper.c      |  6 +-----
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index bbf221a0019..bec50cb4683 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chio.c,v 1.26 2019/06/28 13:34:58 deraadt Exp $	*/
+/*	$OpenBSD: chio.c,v 1.27 2021/06/26 15:42:58 deraadt Exp $	*/
 /*	$NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $	*/
 
 /*
@@ -835,9 +835,5 @@ usage(void)
 
 	fprintf(stderr, "usage: %s [-f changer] command [arg ...]\n",
 	    __progname);
-	fprintf(stderr, "commands:");
-	for (i = 0; commands[i].cc_name; i++)
-		fprintf(stderr, " %s", commands[i].cc_name);
-	fprintf(stderr, "\n");
 	exit(1);
 }
diff --git a/sbin/newfs_ext2fs/newfs_ext2fs.c b/sbin/newfs_ext2fs/newfs_ext2fs.c
index a22423490ae..3017ec220cc 100644
--- a/sbin/newfs_ext2fs/newfs_ext2fs.c
+++ b/sbin/newfs_ext2fs/newfs_ext2fs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newfs_ext2fs.c,v 1.27 2019/06/28 13:32:45 deraadt Exp $ */
+/* $OpenBSD: newfs_ext2fs.c,v 1.28 2021/06/26 15:42:58 deraadt Exp $ */
 /*	$NetBSD: newfs_ext2fs.c,v 1.8 2009/03/02 10:38:13 tsutsui Exp $	*/
 
 /*
@@ -428,34 +428,13 @@ strsuftoi64(const char *desc, const char *arg, int64_t min, int64_t max,
 	return result;
 }
 
-static const char help_strings[] =
-	"\t-b bsize\tblock size\n"
-	"\t-D inodesize\tsize of an inode in bytes (128 or 256)\n"
-	"\t-F \t\tcreate file system image in regular file\n"
-	"\t-f fsize\tfragment size\n"
-	"\t-I \t\tdo not check that the file system type is `ext2fs'\n"
-	"\t-i density\tnumber of bytes per inode\n"
-	"\t-m minfree\tminimum free space %\n"
-	"\t-N \t\tdo not create file system, just print out parameters\n"
-	"\t-n inodes\tnumber of inodes (overrides -i density)\n"
-	"\t-O N\t\tfilesystem revision: 0 ==> REV0, 1 ==> REV1 (default 0)\n"
-	"\t-S secsize\tsector size\n"
-	"\t-s fssize\tfile system size (sectors)\n"
-	"\t-V verbose\toutput verbosity: 0 ==> none, 4 ==> max\n"
-	"\t-v volname\text2fs volume name\n"
-	"\t-Z \t\tpre-zero the image file\n";
-
 static void
 usage(void)
 {
-
 	extern char *__progname;
 
 	fprintf(stderr,
 	    "usage: %s [ fsoptions ] special-device\n", __progname);
-	fprintf(stderr, "where fsoptions are:\n");
-	fprintf(stderr, "%s", help_strings);
-
 	exit(EXIT_FAILURE);
 }
 
diff --git a/sbin/route/route.c b/sbin/route/route.c
index ad7cc538285..8af7c93dc9e 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.254 2021/03/12 19:35:43 florian Exp $	*/
+/*	$OpenBSD: route.c,v 1.255 2021/06/26 15:42:58 deraadt Exp $	*/
 /*	$NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $	*/
 
 /*
@@ -135,9 +135,6 @@ usage(char *cp)
 	fprintf(stderr,
 	    "usage: %s [-dnqtv] [-T rtable] command [[modifiers] args]\n",
 	    __progname);
-	fprintf(stderr,
-	    "commands: add, change, delete, exec, flush, get, monitor, show, "
-	    "sourceaddr\n");
 	exit(1);
 }
 
diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index 925432b56df..42d31ba11d5 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mapper.c,v 1.25 2019/06/28 13:32:48 deraadt Exp $	*/
+/*	$OpenBSD: mapper.c,v 1.26 2021/06/26 15:42:58 deraadt Exp $	*/
 /*	$NetBSD: mapper.c,v 1.3 1995/12/10 11:12:04 mycroft Exp $	*/
 
 /* Mapper for connections between MRouteD multicast routers.
@@ -789,10 +789,6 @@ void usage(void)
     fprintf(stderr,
 	    "usage: %s [-fgn] [-d level] [-r count] [-t seconds] "
 	    "[starting_router]\n\n", __progname);
-    fprintf(stderr, "\t-f  Flood the routing graph with queries\n");
-    fprintf(stderr, "\t    (True by default unless `router' is given)\n");
-    fprintf(stderr, "\t-g  Generate output in GraphEd format\n");
-    fprintf(stderr, "\t-n  Don't look up DNS names for routers\n");
 
     exit(1);
 }
-- 
2.20.1