Remove the -B flag. Most of the byteswapping code was tedu'd already.

2 files changed, 6 insertions, 30 deletions

diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index 7a7e48bbf04..0bcbb8a5cac 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makefs.8,v 1.6 2016/10/17 08:13:24 natano Exp $
+.\"	$OpenBSD: makefs.8,v 1.7 2016/10/18 17:38:20 natano Exp $
 .\"	$NetBSD: makefs.8,v 1.55 2015/11/25 16:32:00 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -42,7 +42,6 @@
 .Nd create a file system image from a directory tree
 .Sh SYNOPSIS
 .Nm
-.Op Fl B Ar endian
 .Op Fl b Ar free-blocks
 .Op Fl f Ar free-files
 .Op Fl M Ar minimum-size
@@ -66,22 +65,6 @@ No special devices or privileges are required to perform this task.
 .Pp
 The options are as follows:
 .Bl -tag -width flag
-.It Fl B Ar endian
-Set the byte order of the image to
-.Ar endian .
-Valid byte orders are
-.Ql 4321 ,
-.Ql big ,
-or
-.Ql be
-for big endian, and
-.Ql 1234 ,
-.Ql little ,
-or
-.Ql le
-for little endian.
-Some file systems may have a fixed byte order; in those cases this
-argument will be ignored.
 .It Fl b Ar free-blocks
 Ensure that a minimum of
 .Ar free-blocks
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 6c15d02656c..a2a7d6a0f2c 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makefs.c,v 1.8 2016/10/17 14:25:33 natano Exp $	*/
+/*	$OpenBSD: makefs.c,v 1.9 2016/10/18 17:38:20 natano Exp $	*/
 /*	$NetBSD: makefs.c,v 1.53 2015/11/27 15:10:32 joerg Exp $	*/
 
 /*
@@ -108,13 +108,8 @@ main(int argc, char *argv[])
 		err(1, "Unable to get system time");
 
 
-	while ((ch = getopt(argc, argv, "B:b:f:M:m:O:o:s:S:t:T:")) != -1) {
+	while ((ch = getopt(argc, argv, "b:f:M:m:O:o:s:S:t:T:")) != -1) {
 		switch (ch) {
-
-		case 'B':
-			warnx("Invalid endian `%s'.", optarg);
-			usage(fstype, &fsoptions);
-			break;
 		case 'b':
 			len = strlen(optarg) - 1;
 			if (optarg[len] == '%') {
@@ -202,7 +197,6 @@ main(int argc, char *argv[])
 		default:
 			usage(fstype, &fsoptions);
 			/* NOTREACHED */
-
 		}
 	}
 	if (debug) {
@@ -376,10 +370,9 @@ usage(fstype_t *fstype, fsinfo_t *fsoptions)
 
 	prog = getprogname();
 	fprintf(stderr,
-"Usage: %s [-B endian] [-b free-blocks] [-f free-files]\n"
-"\t[-M minimum-size] [-m maximum-size] [-O offset]\n"
-"\t[-o fs-options] [-S sector-size] [-s image-size]\n"
-"\t[-T <timestamp/file>] [-t fs-type] image-file directory\n",
+"Usage: %s [-b free-blocks] [-f free-files] [-M minimum-size]\n"
+"\t[-m maximum-size] [-O offset] [-o fs-options] [-S sector-size]\n"
+"\t[-s image-size] [-T <timestamp/file>] [-t fs-type] image-file directory\n",
 	    prog);
 
 	if (fstype) {