From 0cec007c5f3f6a22c8bc7bc4cebfccac8afbb11e Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 26 Nov 1998 23:13:13 +0000
Subject: Initial commit of ported NetBSD USB stack

---
 usr.sbin/usbdevs/usbdevs.c | 212 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 212 insertions(+)
 create mode 100644 usr.sbin/usbdevs/usbdevs.c

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
new file mode 100644
index 0000000000000..a12a9941bb9fc
--- /dev/null
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -0,0 +1,212 @@
+/*	$NetBSD: usbdevs.c,v 1.4 1998/07/23 13:57:51 augustss Exp $	*/
+
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Author: Lennart Augustsson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <err.h>
+#include <errno.h>
+#include <dev/usb/usb.h>
+#if defined(__FreeBSD__)
+#include <sys/ioctl.h>
+#endif
+
+#define USBDEV "/dev/usb"
+
+int verbose;
+
+void usage __P((void));
+void usbdev __P((int f, int a, int rec));
+void usbdump __P((int f));
+void dumpone __P((char *name, int f, int addr));
+int main __P((int, char **));
+
+extern char *__progname;
+
+void
+usage()
+{
+	fprintf(stderr, "Usage: %s [-a addr] [-f dev] [-v]\n", __progname);
+	exit(1);
+}
+
+char done[USB_MAX_DEVICES];
+int indent;
+
+void
+usbdev(f, a, rec)
+	int f;
+	int a;
+	int rec;
+{
+	struct usb_device_info di;
+	int e, p;
+
+	di.addr = a;
+	e = ioctl(f, USB_DEVICEINFO, &di);
+	if (e)
+		return;
+	done[a] = 1;
+	printf("addr %d: ", di.addr);
+	if (verbose) {
+		if (di.lowspeed)
+			printf("low speed, ");
+		if (di.power)
+			printf("power %d mA, ", di.power);
+		else
+			printf("self powered, ");
+		if (di.config)
+			printf("config %d, ", di.config);
+		else
+			printf("unconfigured, ");
+	}
+	printf("%s, %s", di.product, di.vendor);
+	if (verbose)
+		printf(", rev %s", di.revision);
+	printf("\n");
+	if (!rec)
+		return;
+	for (p = 0; p < di.nports; p++) {
+		int s = di.ports[p];
+		if (s >= USB_MAX_DEVICES) {
+			if (verbose) {
+				printf("%*sport %d %s\n", indent+1, "", p+1,
+				       s == USB_PORT_ENABLED ? "enabled" :
+				       s == USB_PORT_SUSPENDED ? "suspended" : 
+				       s == USB_PORT_POWERED ? "powered" :
+				       s == USB_PORT_DISABLED ? "disabled" :
+				       "???");
+				
+			}
+			continue;
+		}
+		indent++;
+		printf("%*s", indent, "");
+		if (verbose)
+			printf("port %d ", p+1);
+		usbdev(f, di.ports[p], 1);
+		indent--;
+	}
+}
+
+void
+usbdump(f)
+	int f;
+{
+	int a;
+
+	for (a = 1; a < USB_MAX_DEVICES; a++) {
+		if (!done[a])
+			usbdev(f, a, 1);
+	}
+}
+
+void
+dumpone(name, f, addr)
+	char *name;
+	int f;
+	int addr;
+{
+	if (verbose)
+		printf("Controller %s:\n", name);
+	indent = 0;
+	memset(done, 0, sizeof done);
+	if (addr)
+		usbdev(f, addr, 0);
+	else
+		usbdump(f);
+}
+
+int
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	int ch, i, f;
+	char buf[50];
+	extern int optind;
+	extern char *optarg;
+	char *dev = 0;
+	int addr = 0;
+	int ncont;
+
+	while ((ch = getopt(argc, argv, "a:f:v")) != -1) {
+		switch(ch) {
+		case 'a':
+			addr = atoi(optarg);
+			break;
+		case 'f':
+			dev = optarg;
+			break;
+		case 'v':
+			verbose = 1;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (dev == 0) {
+		for (ncont = 0, i = 0; i < 10; i++) {
+			sprintf(buf, "%s%d", USBDEV, i);
+			f = open(buf, O_RDONLY);
+			if (f >= 0) {
+				ncont++;
+				dumpone(buf, f, addr);
+				close(f);
+			} else {
+				if (errno == EACCES)
+					warn("%s", buf);
+			}
+		}
+		if (verbose && ncont == 0)
+			printf("%s: no USB controllers found\n", __progname);
+	} else {
+		f = open(dev, O_RDONLY);
+		if (f >= 0)
+			dumpone(dev, f, addr);
+		else
+			err(1, "%s", dev);
+	}
+	exit(0);
+}
-- 
cgit v1.3


From bea029a1662c26524a04231c8b7ac48205e8e4ed Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Mon, 14 Dec 1998 09:40:15 +0000
Subject: Added Id

---
 sys/dev/pci/ohci_pci.c     | 1 +
 sys/dev/pci/uhci_pci.c     | 2 ++
 usr.sbin/usbd/usbd.8       | 1 +
 usr.sbin/usbd/usbd.c       | 1 +
 usr.sbin/usbdevs/Makefile  | 2 +-
 usr.sbin/usbdevs/usbdevs.8 | 1 +
 usr.sbin/usbdevs/usbdevs.c | 1 +
 7 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index 0648746679d22..0d3e325e19b20 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: ohci_pci.c,v 1.5 1998/11/25 22:32:04 augustss Exp $	*/
+/*	FreeBSD $Id$ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index f17b9af2747ab..c0efd73899d05 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -1,3 +1,5 @@
+/*	FreeBSD $Id$ */
+
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8
index 47d745ec6ea2f..41e96aee3f4d1 100644
--- a/usr.sbin/usbd/usbd.8
+++ b/usr.sbin/usbd/usbd.8
@@ -1,4 +1,5 @@
 .\" $NetBSD: usbd.8,v 1.2 1998/07/13 11:01:50 augustss Exp $
+.\" FreeBSD $Id$
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index 99a2d525ae4f1..bde1cc6281f39 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: usbd.c,v 1.2 1998/07/23 18:39:53 augustss Exp $	*/
+/*	FreeBSD $Id$ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 074468292fbb4..0393156cf9fb1 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.2 1998/07/12 20:40:45 augustss Exp $
-#	$Id$
+#	FreeBSD $Id: Makefile,v 1.2 1998/12/13 15:52:26 bde Exp $
 
 PROG=	usbdevs
 MAN8=	usbdevs.8
diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index 8f9f256c320a9..46ed36e21117e 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -1,4 +1,5 @@
 .\" $NetBSD: usbdevs.8,v 1.3 1998/07/23 13:57:51 augustss Exp $
+.\" FreeBSD $Id$
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index a12a9941bb9fc..171c908d4a1cb 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,4 +1,5 @@
 /*	$NetBSD: usbdevs.c,v 1.4 1998/07/23 13:57:51 augustss Exp $	*/
+/*	FreeBSD $Id$ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
-- 
cgit v1.3


From 6f749ef4fc752ee542c05a22c62683028dc47609 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Sun, 11 Apr 1999 21:03:28 +0000
Subject: Syncing with NetBSD version 1998/12/14

---
 usr.sbin/usbd/usbd.8       |  2 +-
 usr.sbin/usbd/usbd.c       | 15 +++++++--------
 usr.sbin/usbdevs/Makefile  |  3 ++-
 usr.sbin/usbdevs/usbdevs.8 |  2 +-
 usr.sbin/usbdevs/usbdevs.c | 14 +++++++++-----
 5 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/usr.sbin/usbd/usbd.8 b/usr.sbin/usbd/usbd.8
index 41e96aee3f4d1..5b496f9bc4e20 100644
--- a/usr.sbin/usbd/usbd.8
+++ b/usr.sbin/usbd/usbd.8
@@ -1,5 +1,5 @@
 .\" $NetBSD: usbd.8,v 1.2 1998/07/13 11:01:50 augustss Exp $
-.\" FreeBSD $Id$
+.\" $FreeBSD$
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index bde1cc6281f39..c1f9f0afb8ac6 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -1,11 +1,12 @@
-/*	$NetBSD: usbd.c,v 1.2 1998/07/23 18:39:53 augustss Exp $	*/
-/*	FreeBSD $Id$ */
+/*	$NetBSD: usbd.c,v 1.4 1998/12/09 00:57:19 augustss Exp $	*/
+/*	$FreeBSD$	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
- * Author: Lennart Augustsson
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (augustss@netbsd.org).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -72,7 +73,7 @@ usage(void)
  * driven explore to find it.  Therefore we run an exploration
  * at regular intervals to catch those.
  */
-#define TIMEOUT 30
+#define TIMEOUT 300
 
 int
 main(int argc, char **argv)
@@ -160,15 +161,13 @@ main(int argc, char **argv)
 	if (!debug)
 		daemon(0, 0);
 
-	
-
-	FD_ZERO(&fdset);
 	for (;;) {
+		FD_ZERO(&fdset);
 		for (i = 0; i < ndevs; i++)
 			FD_SET(fds[i], &fdset);
 		timo.tv_usec = 0;
 		timo.tv_sec = itimo;
-		r = select(maxfd+1, &fdset, &fdset, 0, itimo ? &timo : 0);
+		r = select(maxfd+1, 0, &fdset, 0, itimo ? &timo : 0);
 		if (r < 0)
 			warn("select failed\n");
 		for (i = 0; i < ndevs; i++)
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index 0393156cf9fb1..3c65af39166b3 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -1,7 +1,8 @@
 #	$NetBSD: Makefile,v 1.2 1998/07/12 20:40:45 augustss Exp $
-#	FreeBSD $Id: Makefile,v 1.2 1998/12/13 15:52:26 bde Exp $
+#	FreeBSD $Id: Makefile,v 1.3 1998/12/14 09:40:15 n_hibma Exp $
 
 PROG=	usbdevs
+SRCS=	usbdevs.c
 MAN8=	usbdevs.8
 CFLAGS+=-I${.CURDIR}/../../sys
 
diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index 46ed36e21117e..7aa10e4a00cc6 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -1,5 +1,5 @@
 .\" $NetBSD: usbdevs.8,v 1.3 1998/07/23 13:57:51 augustss Exp $
-.\" FreeBSD $Id$
+.\" $FreeBSD$
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 171c908d4a1cb..009ba5f2168ab 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,11 +1,12 @@
 /*	$NetBSD: usbdevs.c,v 1.4 1998/07/23 13:57:51 augustss Exp $	*/
-/*	FreeBSD $Id$ */
+/*	$FreeBSD$	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
- * Author: Lennart Augustsson
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (augustss@netbsd.org).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -98,9 +99,12 @@ usbdev(f, a, rec)
 		else
 			printf("unconfigured, ");
 	}
-	printf("%s, %s", di.product, di.vendor);
-	if (verbose)
-		printf(", rev %s", di.revision);
+	if (verbose) {
+		printf("%s(0x%04x), %s(0x%04x), rev %s",
+			di.product, di.productNo,
+			di.vendor, di.vendorNo, di.revision);
+	} else
+		printf("%s, %s", di.product, di.vendor);
 	printf("\n");
 	if (!rec)
 		return;
-- 
cgit v1.3


From f3e63a297725ac5bd2409b66b2487544545e1be0 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 7 Oct 1999 19:41:00 +0000
Subject: Deconfuse release and revision

---
 usr.sbin/usbdevs/usbdevs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 009ba5f2168ab..34aefa8df9472 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -102,7 +102,7 @@ usbdev(f, a, rec)
 	if (verbose) {
 		printf("%s(0x%04x), %s(0x%04x), rev %s",
 			di.product, di.productNo,
-			di.vendor, di.vendorNo, di.revision);
+			di.vendor, di.vendorNo, di.release);
 	} else
 		printf("%s, %s", di.product, di.vendor);
 	printf("\n");
-- 
cgit v1.3


From 1f1669ea5788c8f4cd75987b96445c2e0bf83f27 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Tue, 23 Nov 1999 01:16:10 +0000
Subject: Use releaseNo, not release. release is evil and should go away.

---
 usr.sbin/usbdevs/usbdevs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 34aefa8df9472..09c754b420f34 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -100,9 +100,9 @@ usbdev(f, a, rec)
 			printf("unconfigured, ");
 	}
 	if (verbose) {
-		printf("%s(0x%04x), %s(0x%04x), rev %s",
+		printf("%s(0x%04x), %s(0x%04x), rev 0x%04x",
 			di.product, di.productNo,
-			di.vendor, di.vendorNo, di.release);
+			di.vendor, di.vendorNo, di.releaseNo);
 	} else
 		printf("%s, %s", di.product, di.vendor);
 	printf("\n");
-- 
cgit v1.3


From 8c1dde21a35bb8178593ec1ebf78d9785fd6409f Mon Sep 17 00:00:00 2001
From: Josef Karthauser <joe@FreeBSD.org>
Date: Sat, 16 Feb 2002 16:16:12 +0000
Subject: Merge from NetBSD:

* Add a -d flag to show the device drivers associated with each device.
* Update to use the new speed structure entry.
---
 usr.sbin/usbdevs/usbdevs.8 | 11 +++---
 usr.sbin/usbdevs/usbdevs.c | 88 ++++++++++++++++++++++++++--------------------
 2 files changed, 56 insertions(+), 43 deletions(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index b00425adfe524..43b6bd0949c4f 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -1,5 +1,5 @@
-.\" $NetBSD: usbdevs.8,v 1.3 1998/07/23 13:57:51 augustss Exp $
-.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
+.\" $NetBSD: usbdevs.8,v 1.5 2000/10/15 12:44:11 bjh21 Exp $
+.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" Author: Lennart Augustsson
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 12, 1998
+.Dd October 15, 2000
 .Dt USBDEVS 8
 .Os
 .Sh NAME
@@ -43,6 +43,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl a Ar addr
+.Op Fl d
 .Op Fl f Ar dev
 .Op Fl v
 .Sh DESCRIPTION
@@ -52,9 +53,11 @@ with some information about each device.
 The indentation of each line indicates its distance from the root.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width Fl
 .It Fl a Ar addr
 only print information about the device at the given address.
+.It Fl d
+Show the device drivers associated with each device.
 .It Fl f Ar dev
 only print information for the given USB controller.
 .It Fl v
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 09c754b420f34..26196ec3f692b 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdevs.c,v 1.4 1998/07/23 13:57:51 augustss Exp $	*/
+/*	$NetBSD: usbdevs.c,v 1.17 2001/02/19 23:22:48 cgd Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -52,20 +52,20 @@
 
 #define USBDEV "/dev/usb"
 
-int verbose;
+int verbose = 0;
+int showdevs = 0;
 
-void usage __P((void));
-void usbdev __P((int f, int a, int rec));
-void usbdump __P((int f));
-void dumpone __P((char *name, int f, int addr));
-int main __P((int, char **));
-
-extern char *__progname;
+void usage(void);
+void usbdev(int f, int a, int rec);
+void usbdump(int f);
+void dumpone(char *name, int f, int addr);
+int main(int, char **);
 
 void
 usage()
 {
-	fprintf(stderr, "Usage: %s [-a addr] [-f dev] [-v]\n", __progname);
+	fprintf(stderr, "Usage: %s [-a addr] [-d] [-f dev] [-v]\n",
+	    getprogname());
 	exit(1);
 }
 
@@ -73,23 +73,27 @@ char done[USB_MAX_DEVICES];
 int indent;
 
 void
-usbdev(f, a, rec)
-	int f;
-	int a;
-	int rec;
+usbdev(int f, int a, int rec)
 {
 	struct usb_device_info di;
-	int e, p;
+	int e, p, i;
 
 	di.addr = a;
 	e = ioctl(f, USB_DEVICEINFO, &di);
-	if (e)
+	if (e) {
+		if (errno != ENXIO)
+			printf("addr %d: I/O error\n", a);
 		return;
+	}
+	printf("addr %d: ", a);
 	done[a] = 1;
-	printf("addr %d: ", di.addr);
 	if (verbose) {
-		if (di.lowspeed)
-			printf("low speed, ");
+		switch (di.speed) {
+		case USB_SPEED_LOW:  printf("low speed, "); break;
+		case USB_SPEED_FULL: printf("full speed, "); break;
+		case USB_SPEED_HIGH: printf("high speed, "); break;
+		default: break;
+		}
 		if (di.power)
 			printf("power %d mA, ", di.power);
 		else
@@ -100,12 +104,18 @@ usbdev(f, a, rec)
 			printf("unconfigured, ");
 	}
 	if (verbose) {
-		printf("%s(0x%04x), %s(0x%04x), rev 0x%04x",
-			di.product, di.productNo,
-			di.vendor, di.vendorNo, di.releaseNo);
+		printf("%s(0x%04x), %s(0x%04x), rev %s",
+		       di.product, di.productNo,
+		       di.vendor, di.vendorNo, di.release);
 	} else
 		printf("%s, %s", di.product, di.vendor);
 	printf("\n");
+	if (showdevs) {
+		for (i = 0; i < USB_MAX_DEVNAMES; i++)
+			if (di.devnames[i][0])
+				printf("%*s  %s\n", indent, "",
+				       di.devnames[i]);
+	}
 	if (!rec)
 		return;
 	for (p = 0; p < di.nports; p++) {
@@ -126,14 +136,16 @@ usbdev(f, a, rec)
 		printf("%*s", indent, "");
 		if (verbose)
 			printf("port %d ", p+1);
-		usbdev(f, di.ports[p], 1);
+		if (s == 0)
+			printf("addr 0 should never happen!\n");
+		else
+			usbdev(f, s, 1);
 		indent--;
 	}
 }
 
 void
-usbdump(f)
-	int f;
+usbdump(int f)
 {
 	int a;
 
@@ -144,10 +156,7 @@ usbdump(f)
 }
 
 void
-dumpone(name, f, addr)
-	char *name;
-	int f;
-	int addr;
+dumpone(char *name, int f, int addr)
 {
 	if (verbose)
 		printf("Controller %s:\n", name);
@@ -160,23 +169,22 @@ dumpone(name, f, addr)
 }
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char **argv)
 {
 	int ch, i, f;
 	char buf[50];
-	extern int optind;
-	extern char *optarg;
 	char *dev = 0;
 	int addr = 0;
 	int ncont;
 
-	while ((ch = getopt(argc, argv, "a:f:v")) != -1) {
+	while ((ch = getopt(argc, argv, "a:df:v?")) != -1) {
 		switch(ch) {
 		case 'a':
 			addr = atoi(optarg);
 			break;
+		case 'd':
+			showdevs++;
+			break;
 		case 'f':
 			dev = optarg;
 			break;
@@ -196,16 +204,18 @@ main(argc, argv)
 			sprintf(buf, "%s%d", USBDEV, i);
 			f = open(buf, O_RDONLY);
 			if (f >= 0) {
-				ncont++;
 				dumpone(buf, f, addr);
 				close(f);
 			} else {
-				if (errno == EACCES)
-					warn("%s", buf);
+				if (errno == ENOENT || errno == ENXIO)
+					continue;
+				warn("%s", buf);
 			}
+			ncont++;
 		}
 		if (verbose && ncont == 0)
-			printf("%s: no USB controllers found\n", __progname);
+			printf("%s: no USB controllers found\n",
+			    getprogname());
 	} else {
 		f = open(dev, O_RDONLY);
 		if (f >= 0)
-- 
cgit v1.3


From 5bcd0580d7c8741e625461cdd8bcc8690479af23 Mon Sep 17 00:00:00 2001
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Wed, 20 Feb 2002 20:47:21 +0000
Subject: Prefix structure members to protect them against clashes with eg. c++
 keywords.

This keeps us in sync with NetBSD because they actually committed
my delta first.

Ok'd by: lennard
---
 lib/libusb/descr.c         |  4 +-
 lib/libusbhid/descr.c      |  4 +-
 sys/dev/usb/ugen.c         | 82 +++++++++++++++++++--------------------
 sys/dev/usb/uhid.c         | 14 +++----
 sys/dev/usb/usb.c          | 14 +++----
 sys/dev/usb/usb.h          | 96 +++++++++++++++++++++++-----------------------
 sys/dev/usb/usb_subr.c     | 42 ++++++++++----------
 sys/dev/usb/usbdi.c        |  2 +-
 usr.sbin/usbd/usbd.c       | 42 ++++++++++----------
 usr.sbin/usbdevs/usbdevs.c | 26 ++++++-------
 10 files changed, 163 insertions(+), 163 deletions(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/lib/libusb/descr.c b/lib/libusb/descr.c
index 294cdff631233..11c031efdbcba 100644
--- a/lib/libusb/descr.c
+++ b/lib/libusb/descr.c
@@ -51,11 +51,11 @@ hid_get_report_desc(int fd)
 {
 	struct usb_ctl_report_desc rep;
 
-	rep.size = 0;
+	rep.ucrd_size = 0;
 	if (ioctl(fd, USB_GET_REPORT_DESC, &rep) < 0)
 		return (NULL);
 
-	return hid_use_report_desc(rep.data, (unsigned int)rep.size);
+	return hid_use_report_desc(rep.ucrd_data, (unsigned int)rep.ucrd_size);
 }
 
 report_desc_t
diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c
index 294cdff631233..11c031efdbcba 100644
--- a/lib/libusbhid/descr.c
+++ b/lib/libusbhid/descr.c
@@ -51,11 +51,11 @@ hid_get_report_desc(int fd)
 {
 	struct usb_ctl_report_desc rep;
 
-	rep.size = 0;
+	rep.ucrd_size = 0;
 	if (ioctl(fd, USB_GET_REPORT_DESC, &rep) < 0)
 		return (NULL);
 
-	return hid_use_report_desc(rep.data, (unsigned int)rep.size);
+	return hid_use_report_desc(rep.ucrd_data, (unsigned int)rep.ucrd_size);
 }
 
 report_desc_t
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index ae18038a8594e..c52995488210b 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1161,37 +1161,37 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 	case USB_GET_ALTINTERFACE:
 		ai = (struct usb_alt_interface *)addr;
 		err = usbd_device2interface_handle(sc->sc_udev, 
-			  ai->interface_index, &iface);
+			  ai->uai_interface_index, &iface);
 		if (err)
 			return (EINVAL);
 		idesc = usbd_get_interface_descriptor(iface);
 		if (idesc == NULL)
 			return (EIO);
-		ai->alt_no = idesc->bAlternateSetting;
+		ai->uai_alt_no = idesc->bAlternateSetting;
 		break;
 	case USB_SET_ALTINTERFACE:
 		if (!(flag & FWRITE))
 			return (EPERM);
 		ai = (struct usb_alt_interface *)addr;
 		err = usbd_device2interface_handle(sc->sc_udev, 
-			  ai->interface_index, &iface);
+			  ai->uai_interface_index, &iface);
 		if (err)
 			return (EINVAL);
-		err = ugen_set_interface(sc, ai->interface_index, ai->alt_no);
+		err = ugen_set_interface(sc, ai->uai_interface_index, ai->uai_alt_no);
 		if (err)
 			return (EINVAL);
 		break;
 	case USB_GET_NO_ALT:
 		ai = (struct usb_alt_interface *)addr;
-		cdesc = ugen_get_cdesc(sc, ai->config_index, 0);
+		cdesc = ugen_get_cdesc(sc, ai->uai_config_index, 0);
 		if (cdesc == NULL)
 			return (EINVAL);
-		idesc = usbd_find_idesc(cdesc, ai->interface_index, 0);
+		idesc = usbd_find_idesc(cdesc, ai->uai_interface_index, 0);
 		if (idesc == NULL) {
 			free(cdesc, M_TEMP);
 			return (EINVAL);
 		}
-		ai->alt_no = usbd_get_no_alts(cdesc, idesc->bInterfaceNumber);
+		ai->uai_alt_no = usbd_get_no_alts(cdesc, idesc->bInterfaceNumber);
 		free(cdesc, M_TEMP);
 		break;
 	case USB_GET_DEVICE_DESC:
@@ -1200,47 +1200,47 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 		break;
 	case USB_GET_CONFIG_DESC:
 		cd = (struct usb_config_desc *)addr;
-		cdesc = ugen_get_cdesc(sc, cd->config_index, 0);
+		cdesc = ugen_get_cdesc(sc, cd->ucd_config_index, 0);
 		if (cdesc == NULL)
 			return (EINVAL);
-		cd->desc = *cdesc;
+		cd->ucd_desc = *cdesc;
 		free(cdesc, M_TEMP);
 		break;
 	case USB_GET_INTERFACE_DESC:
 		id = (struct usb_interface_desc *)addr;
-		cdesc = ugen_get_cdesc(sc, id->config_index, 0);
+		cdesc = ugen_get_cdesc(sc, id->uid_config_index, 0);
 		if (cdesc == NULL)
 			return (EINVAL);
-		if (id->config_index == USB_CURRENT_CONFIG_INDEX &&
-		    id->alt_index == USB_CURRENT_ALT_INDEX)
-			alt = ugen_get_alt_index(sc, id->interface_index);
+		if (id->uid_config_index == USB_CURRENT_CONFIG_INDEX &&
+		    id->uid_alt_index == USB_CURRENT_ALT_INDEX)
+			alt = ugen_get_alt_index(sc, id->uid_interface_index);
 		else
-			alt = id->alt_index;
-		idesc = usbd_find_idesc(cdesc, id->interface_index, alt);
+			alt = id->uid_alt_index;
+		idesc = usbd_find_idesc(cdesc, id->uid_interface_index, alt);
 		if (idesc == NULL) {
 			free(cdesc, M_TEMP);
 			return (EINVAL);
 		}
-		id->desc = *idesc;
+		id->uid_desc = *idesc;
 		free(cdesc, M_TEMP);
 		break;
 	case USB_GET_ENDPOINT_DESC:
 		ed = (struct usb_endpoint_desc *)addr;
-		cdesc = ugen_get_cdesc(sc, ed->config_index, 0);
+		cdesc = ugen_get_cdesc(sc, ed->ued_config_index, 0);
 		if (cdesc == NULL)
 			return (EINVAL);
-		if (ed->config_index == USB_CURRENT_CONFIG_INDEX &&
-		    ed->alt_index == USB_CURRENT_ALT_INDEX)
-			alt = ugen_get_alt_index(sc, ed->interface_index);
+		if (ed->ued_config_index == USB_CURRENT_CONFIG_INDEX &&
+		    ed->ued_alt_index == USB_CURRENT_ALT_INDEX)
+			alt = ugen_get_alt_index(sc, ed->ued_interface_index);
 		else
-			alt = ed->alt_index;
-		edesc = usbd_find_edesc(cdesc, ed->interface_index, 
-					alt, ed->endpoint_index);
+			alt = ed->ued_alt_index;
+		edesc = usbd_find_edesc(cdesc, ed->ued_interface_index, 
+					alt, ed->ued_endpoint_index);
 		if (edesc == NULL) {
 			free(cdesc, M_TEMP);
 			return (EINVAL);
 		}
-		ed->desc = *edesc;
+		ed->ued_desc = *edesc;
 		free(cdesc, M_TEMP);
 		break;
 	case USB_GET_FULL_DESC:
@@ -1251,10 +1251,10 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 		struct usb_full_desc *fd = (struct usb_full_desc *)addr;
 		int error;
 
-		cdesc = ugen_get_cdesc(sc, fd->config_index, &len);
-		if (len > fd->size)
-			len = fd->size;
-		iov.iov_base = (caddr_t)fd->data;
+		cdesc = ugen_get_cdesc(sc, fd->ufd_config_index, &len);
+		if (len > fd->ufd_size)
+			len = fd->ufd_size;
+		iov.iov_base = (caddr_t)fd->ufd_data;
 		iov.iov_len = len;
 		uio.uio_iov = &iov;
 		uio.uio_iovcnt = 1;
@@ -1269,15 +1269,15 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 	}
 	case USB_GET_STRING_DESC:
 		si = (struct usb_string_desc *)addr;
-		err = usbd_get_string_desc(sc->sc_udev, si->string_index, 
-			  si->language_id, &si->desc);
+		err = usbd_get_string_desc(sc->sc_udev, si->usd_string_index, 
+			  si->usd_language_id, &si->usd_desc);
 		if (err)
 			return (EINVAL);
 		break;
 	case USB_DO_REQUEST:
 	{
 		struct usb_ctl_request *ur = (void *)addr;
-		int len = UGETW(ur->request.wLength);
+		int len = UGETW(ur->ucr_request.wLength);
 		struct iovec iov;
 		struct uio uio;
 		void *ptr = 0;
@@ -1287,18 +1287,18 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 		if (!(flag & FWRITE))
 			return (EPERM);
 		/* Avoid requests that would damage the bus integrity. */
-		if ((ur->request.bmRequestType == UT_WRITE_DEVICE &&
-		     ur->request.bRequest == UR_SET_ADDRESS) ||
-		    (ur->request.bmRequestType == UT_WRITE_DEVICE &&
-		     ur->request.bRequest == UR_SET_CONFIG) ||
-		    (ur->request.bmRequestType == UT_WRITE_INTERFACE &&
-		     ur->request.bRequest == UR_SET_INTERFACE))
+		if ((ur->ucr_request.bmRequestType == UT_WRITE_DEVICE &&
+		     ur->ucr_request.bRequest == UR_SET_ADDRESS) ||
+		    (ur->ucr_request.bmRequestType == UT_WRITE_DEVICE &&
+		     ur->ucr_request.bRequest == UR_SET_CONFIG) ||
+		    (ur->ucr_request.bmRequestType == UT_WRITE_INTERFACE &&
+		     ur->ucr_request.bRequest == UR_SET_INTERFACE))
 			return (EINVAL);
 
 		if (len < 0 || len > 32767)
 			return (EINVAL);
 		if (len != 0) {
-			iov.iov_base = (caddr_t)ur->data;
+			iov.iov_base = (caddr_t)ur->ucr_data;
 			iov.iov_len = len;
 			uio.uio_iov = &iov;
 			uio.uio_iovcnt = 1;
@@ -1306,7 +1306,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 			uio.uio_offset = 0;
 			uio.uio_segflg = UIO_USERSPACE;
 			uio.uio_rw =
-				ur->request.bmRequestType & UT_READ ? 
+				ur->ucr_request.bmRequestType & UT_READ ? 
 				UIO_READ : UIO_WRITE;
 			uio.uio_procp = p;
 			ptr = malloc(len, M_TEMP, M_WAITOK);
@@ -1316,8 +1316,8 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 					goto ret;
 			}
 		}
-		err = usbd_do_request_flags(sc->sc_udev, &ur->request, 
-			  ptr, ur->flags, &ur->actlen);
+		err = usbd_do_request_flags(sc->sc_udev, &ur->ucr_request, 
+			  ptr, ur->ucr_flags, &ur->ucr_actlen);
 		if (err) {
 			error = EIO;
 			goto ret;
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index be7e8dc62e7dc..0578133b70d20 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -633,9 +633,9 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
 
 	case USB_GET_REPORT_DESC:
 		rd = (struct usb_ctl_report_desc *)addr;
-		size = min(sc->sc_repdesc_size, sizeof rd->data);
-		rd->size = size;
-		memcpy(rd->data, sc->sc_repdesc, size);
+		size = min(sc->sc_repdesc_size, sizeof rd->ucrd_data);
+		rd->ucrd_size = size;
+		memcpy(rd->ucrd_data, sc->sc_repdesc, size);
 		break;
 
 	case USB_SET_IMMED:
@@ -653,7 +653,7 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
 
 	case USB_GET_REPORT:
 		re = (struct usb_ctl_report *)addr;
-		switch (re->report) {
+		switch (re->ucr_report) {
 		case UHID_INPUT_REPORT:
 			size = sc->sc_isize;
 			id = sc->sc_iid;
@@ -669,7 +669,7 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
 		default:
 			return (EINVAL);
 		}
-		err = usbd_get_report(sc->sc_iface, re->report, id, re->data,
+		err = usbd_get_report(sc->sc_iface, re->ucr_report, id, re->ucr_data,
 			  size);
 		if (err)
 			return (EIO);
@@ -677,7 +677,7 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
 
 	case USB_SET_REPORT:
 		re = (struct usb_ctl_report *)addr;
-		switch (re->report) {
+		switch (re->ucr_report) {
 		case UHID_INPUT_REPORT:
 			size = sc->sc_isize;
 			id = sc->sc_iid;
@@ -693,7 +693,7 @@ uhid_do_ioctl(sc, cmd, addr, flag, p)
 		default:
 			return (EINVAL);
 		}
-		err = usbd_set_report(sc->sc_iface, re->report, id, re->data,
+		err = usbd_set_report(sc->sc_iface, re->ucr_report, id, re->ucr_data,
 			  size);
 		if (err)
 			return (EIO);
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index e54311c8c737d..a96bf352fd950 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -470,11 +470,11 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 	case USB_REQUEST:
 	{
 		struct usb_ctl_request *ur = (void *)data;
-		int len = UGETW(ur->request.wLength);
+		int len = UGETW(ur->ucr_request.wLength);
 		struct iovec iov;
 		struct uio uio;
 		void *ptr = 0;
-		int addr = ur->addr;
+		int addr = ur->ucr_addr;
 		usbd_status err;
 		int error = 0;
 
@@ -485,7 +485,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 		    sc->sc_bus->devices[addr] == 0)
 			return (EINVAL);
 		if (len != 0) {
-			iov.iov_base = (caddr_t)ur->data;
+			iov.iov_base = (caddr_t)ur->ucr_data;
 			iov.iov_len = len;
 			uio.uio_iov = &iov;
 			uio.uio_iovcnt = 1;
@@ -493,7 +493,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 			uio.uio_offset = 0;
 			uio.uio_segflg = UIO_USERSPACE;
 			uio.uio_rw =
-				ur->request.bmRequestType & UT_READ ?
+				ur->ucr_request.bmRequestType & UT_READ ?
 				UIO_READ : UIO_WRITE;
 			uio.uio_procp = p;
 			ptr = malloc(len, M_TEMP, M_WAITOK);
@@ -504,7 +504,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 			}
 		}
 		err = usbd_do_request_flags(sc->sc_bus->devices[addr],
-			  &ur->request, ptr, ur->flags, &ur->actlen);
+			  &ur->ucr_request, ptr, ur->ucr_flags, &ur->ucr_actlen);
 		if (err) {
 			error = EIO;
 			goto ret;
@@ -525,7 +525,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 	case USB_DEVICEINFO:
 	{
 		struct usb_device_info *di = (void *)data;
-		int addr = di->addr;
+		int addr = di->udi_addr;
 		usbd_device_handle dev;
 
 		if (addr < 1 || addr >= USB_MAX_DEVICES)
@@ -679,7 +679,7 @@ usb_add_event(int type, struct usb_event *uep)
 		for (ueqi = TAILQ_FIRST(&usb_events); ueqi; ueqi = ueqi_next) {
 			ueqi_next = TAILQ_NEXT(ueqi, next);
 			if (ueqi->ue.u.ue_driver.ue_cookie.cookie ==
-			    uep->u.ue_device.cookie.cookie) {
+			    uep->u.ue_device.udi_cookie.cookie) {
 				TAILQ_REMOVE(&usb_events, ueqi, next);
 				free(ueqi, M_USBDEV);
 				usb_nevents--;
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index 2951ecade6a50..b300dd7546e6f 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -525,58 +525,58 @@ typedef struct {
 /*** ioctl() related stuff ***/
 
 struct usb_ctl_request {
-	int	addr;
-	usb_device_request_t request;
-	void	*data;
-	int	flags;
+	int	ucr_addr;
+	usb_device_request_t ucr_request;
+	void	*ucr_data;
+	int	ucr_flags;
 #define USBD_SHORT_XFER_OK	0x04	/* allow short reads */
-	int	actlen;		/* actual length transferred */
+	int	ucr_actlen;		/* actual length transferred */
 };
 
 struct usb_alt_interface {
-	int	config_index;
-	int	interface_index;
-	int	alt_no;
+	int	uai_config_index;
+	int	uai_interface_index;
+	int	uai_alt_no;
 };
 
 #define USB_CURRENT_CONFIG_INDEX (-1)
 #define USB_CURRENT_ALT_INDEX (-1)
 
 struct usb_config_desc {
-	int	config_index;
-	usb_config_descriptor_t desc;
+	int	ucd_config_index;
+	usb_config_descriptor_t ucd_desc;
 };
 
 struct usb_interface_desc {
-	int	config_index;
-	int	interface_index;
-	int	alt_index;
-	usb_interface_descriptor_t desc;
+	int	uid_config_index;
+	int	uid_interface_index;
+	int	uid_alt_index;
+	usb_interface_descriptor_t uid_desc;
 };
 
 struct usb_endpoint_desc {
-	int	config_index;
-	int	interface_index;
-	int	alt_index;
-	int	endpoint_index;
-	usb_endpoint_descriptor_t desc;
+	int	ued_config_index;
+	int	ued_interface_index;
+	int	ued_alt_index;
+	int	ued_endpoint_index;
+	usb_endpoint_descriptor_t ued_desc;
 };
 
 struct usb_full_desc {
-	int	config_index;
-	u_int	size;
-	u_char	*data;
+	int	ufd_config_index;
+	u_int	ufd_size;
+	u_char	*ufd_data;
 };
 
 struct usb_string_desc {
-	int	string_index;
-	int	language_id;
-	usb_string_descriptor_t desc;
+	int	usd_string_index;
+	int	usd_language_id;
+	usb_string_descriptor_t usd_desc;
 };
 
 struct usb_ctl_report_desc {
-	int	size;
-	u_char	data[1024];	/* filled data size will vary */
+	int	ucrd_size;
+	u_char	ucrd_data[1024];	/* filled data size will vary */
 };
 
 typedef struct { u_int32_t cookie; } usb_event_cookie_t;
@@ -584,27 +584,27 @@ typedef struct { u_int32_t cookie; } usb_event_cookie_t;
 #define USB_MAX_DEVNAMES 4
 #define USB_MAX_DEVNAMELEN 16
 struct usb_device_info {
-	u_int8_t	bus;
-	u_int8_t	addr;	/* device address */
-	usb_event_cookie_t cookie;
-	char		product[USB_MAX_STRING_LEN];
-	char		vendor[USB_MAX_STRING_LEN];
-	char		release[8];
-	u_int16_t	productNo;
-	u_int16_t	vendorNo;
-	u_int16_t	releaseNo;
-	u_int8_t	class;
-	u_int8_t	subclass;
-	u_int8_t	protocol;
-	u_int8_t	config;
-	u_int8_t	speed;
+	u_int8_t	udi_bus;
+	u_int8_t	udi_addr;	/* device address */
+	usb_event_cookie_t udi_cookie;
+	char		udi_product[USB_MAX_STRING_LEN];
+	char		udi_vendor[USB_MAX_STRING_LEN];
+	char		udi_release[8];
+	u_int16_t	udi_productNo;
+	u_int16_t	udi_vendorNo;
+	u_int16_t	udi_releaseNo;
+	u_int8_t	udi_class;
+	u_int8_t	udi_subclass;
+	u_int8_t	udi_protocol;
+	u_int8_t	udi_config;
+	u_int8_t	udi_speed;
 #define USB_SPEED_LOW  1
 #define USB_SPEED_FULL 2
 #define USB_SPEED_HIGH 3
-	int		power;	/* power consumption in mA, 0 if selfpowered */
-	int		nports;
-	char		devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN];
-	u_int8_t	ports[16];/* hub only: addresses of devices on ports */
+	int		udi_power;	/* power consumption in mA, 0 if selfpowered */
+	int		udi_nports;
+	char		udi_devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN];
+	u_int8_t	udi_ports[16];/* hub only: addresses of devices on ports */
 #define USB_PORT_ENABLED 0xff
 #define USB_PORT_SUSPENDED 0xfe
 #define USB_PORT_POWERED 0xfd
@@ -612,12 +612,12 @@ struct usb_device_info {
 };
 
 struct usb_ctl_report {
-	int	report;
-	u_char	data[1024];	/* filled data size will vary */
+	int	ucr_report;
+	u_char	ucr_data[1024];	/* filled data size will vary */
 };
 
 struct usb_device_stats {
-	u_long	requests[4];	/* indexed by transfer type UE_* */
+	u_long	uds_requests[4];	/* indexed by transfer type UE_* */
 };
 
 /* Events that can be read from /dev/usb */
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index abbbe90bd6a39..d35a621092e89 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1156,37 +1156,37 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di,
 	struct usbd_port *p;
 	int i, err, s;
 
-	di->bus = USBDEVUNIT(dev->bus->bdev);
-	di->addr = dev->address;
-	di->cookie = dev->cookie;
-	usbd_devinfo_vp(dev, di->vendor, di->product, usedev);
-	usbd_printBCD(di->release, UGETW(dev->ddesc.bcdDevice));
-	di->vendorNo = UGETW(dev->ddesc.idVendor);
-	di->productNo = UGETW(dev->ddesc.idProduct);
-	di->releaseNo = UGETW(dev->ddesc.bcdDevice);
-	di->class = dev->ddesc.bDeviceClass;
-	di->subclass = dev->ddesc.bDeviceSubClass;
-	di->protocol = dev->ddesc.bDeviceProtocol;
-	di->config = dev->config;
-	di->power = dev->self_powered ? 0 : dev->power;
-	di->speed = dev->speed;
+	di->udi_bus = USBDEVUNIT(dev->bus->bdev);
+	di->udi_addr = dev->address;
+	di->udi_cookie = dev->cookie;
+	usbd_devinfo_vp(dev, di->udi_vendor, di->udi_product, usedev);
+	usbd_printBCD(di->udi_release, UGETW(dev->ddesc.bcdDevice));
+	di->udi_vendorNo = UGETW(dev->ddesc.idVendor);
+	di->udi_productNo = UGETW(dev->ddesc.idProduct);
+	di->udi_releaseNo = UGETW(dev->ddesc.bcdDevice);
+	di->udi_class = dev->ddesc.bDeviceClass;
+	di->udi_subclass = dev->ddesc.bDeviceSubClass;
+	di->udi_protocol = dev->ddesc.bDeviceProtocol;
+	di->udi_config = dev->config;
+	di->udi_power = dev->self_powered ? 0 : dev->power;
+	di->udi_speed = dev->speed;
 
 	if (dev->subdevs != NULL) {
 		for (i = 0; dev->subdevs[i] &&
 			     i < USB_MAX_DEVNAMES; i++) {
-			strncpy(di->devnames[i], USBDEVPTRNAME(dev->subdevs[i]),
+			strncpy(di->udi_devnames[i], USBDEVPTRNAME(dev->subdevs[i]),
 				USB_MAX_DEVNAMELEN);
-			di->devnames[i][USB_MAX_DEVNAMELEN-1] = '\0';
+			di->udi_devnames[i][USB_MAX_DEVNAMELEN-1] = '\0';
                 }
         } else {
                 i = 0;
         }
         for (/*i is set */; i < USB_MAX_DEVNAMES; i++)
-                di->devnames[i][0] = 0;                 /* empty */
+                di->udi_devnames[i][0] = 0;                 /* empty */
 
 	if (dev->hub) {
 		for (i = 0; 
-		     i < sizeof(di->ports) / sizeof(di->ports[0]) &&
+		     i < sizeof(di->udi_ports) / sizeof(di->udi_ports[0]) &&
 			     i < dev->hub->hubdesc.bNbrPorts;
 		     i++) {
 			p = &dev->hub->ports[i];
@@ -1203,11 +1203,11 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di,
 				else
 					err = USB_PORT_DISABLED;
 			}
-			di->ports[i] = err;
+			di->udi_ports[i] = err;
 		}
-		di->nports = dev->hub->hubdesc.bNbrPorts;
+		di->udi_nports = dev->hub->hubdesc.bNbrPorts;
 	} else
-		di->nports = 0;
+		di->udi_nports = 0;
 }
 
 void
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index c762918f4807c..368b695e4b6b8 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -823,7 +823,7 @@ usb_transfer_complete(xfer)
 	}
 
 	/* Count completed transfers. */
-	++pipe->device->bus->stats.requests
+	++pipe->device->bus->stats.uds_requests
 		[pipe->endpoint->edesc->bmAttributes & UE_XFERTYPE];
 
 	xfer->done = 1;
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index ff5387d85fe41..1541d5f2e00f1 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -582,23 +582,23 @@ print_event(struct usb_event *event)
 
 		printf(" at %ld.%09ld, %s, %s:\n",
 			timespec->tv_sec, timespec->tv_nsec,
-			devinfo->product, devinfo->vendor);
+			devinfo->udi_product, devinfo->udi_vendor);
 
 		printf("  vndr=0x%04x prdct=0x%04x rlse=0x%04x "
 		       "clss=0x%04x subclss=0x%04x prtcl=0x%04x\n",
-		       devinfo->vendorNo, devinfo->productNo,
-		       devinfo->releaseNo,
-		       devinfo->class, devinfo->subclass, devinfo->protocol);
+		       devinfo->udi_vendorNo, devinfo->udi_productNo,
+		       devinfo->udi_releaseNo,
+		       devinfo->udi_class, devinfo->udi_subclass, devinfo->udi_protocol);
 
-		if (devinfo->devnames[0][0] != '\0') {
+		if (devinfo->udi_devnames[0][0] != '\0') {
 			char c = ' ';
 
 			printf("  device names:");
 			for (i = 0; i < USB_MAX_DEVNAMES; i++) {
-				if (devinfo->devnames[i][0] == '\0')
+				if (devinfo->udi_devnames[i][0] == '\0')
 					break;
 
-				printf("%c%s", c, devinfo->devnames[i]);
+				printf("%c%s", c, devinfo->udi_devnames[i]);
 				c = ',';
 			}
 		}
@@ -681,15 +681,15 @@ match_devname(action_t *action, struct usb_device_info *devinfo)
 	int error;
 
 	for (i = 0; i < USB_MAX_DEVNAMES; i++) {
-		if (devinfo->devnames[i][0] == '\0')
+		if (devinfo->udi_devnames[i][0] == '\0')
 			break;
 
-		error = regexec(&action->devname_regex, devinfo->devnames[i],
+		error = regexec(&action->devname_regex, devinfo->udi_devnames[i],
 				1, &match, 0);
 		if (error == 0) {
 			if (verbose >= 2)
 				printf("%s: %s matches %s\n", __progname,
-					devinfo->devnames[i], action->devname);
+					devinfo->udi_devnames[i], action->devname);
 			return(i);
 		}
 	}
@@ -707,17 +707,17 @@ find_action(struct usb_device_info *devinfo, action_match_t *action_match)
 
 	STAILQ_FOREACH(action, &actions, next) {
 		if ((action->vendor == WILDCARD_INT ||
-		     action->vendor == devinfo->vendorNo) &&
+		     action->vendor == devinfo->udi_vendorNo) &&
 		    (action->product == WILDCARD_INT ||
-		     action->product == devinfo->productNo) &&
+		     action->product == devinfo->udi_productNo) &&
 		    (action->release == WILDCARD_INT ||
-		     action->release == devinfo->releaseNo) &&
+		     action->release == devinfo->udi_releaseNo) &&
 		    (action->class == WILDCARD_INT ||
-		     action->class == devinfo->class) &&
+		     action->class == devinfo->udi_class) &&
 		    (action->subclass == WILDCARD_INT ||
-		     action->subclass == devinfo->subclass) &&
+		     action->subclass == devinfo->udi_subclass) &&
 		    (action->protocol == WILDCARD_INT ||
-		     action->protocol == devinfo->protocol) &&
+		     action->protocol == devinfo->udi_protocol) &&
 		    (action->devname == WILDCARD_STRING ||
 		     (match = match_devname(action, devinfo)) != -1)) {
 			/* found match !*/
@@ -727,16 +727,16 @@ find_action(struct usb_device_info *devinfo, action_match_t *action_match)
 			 * one devname for that device, use that.
 			 */
 			if (match >= 0)
-				devname = devinfo->devnames[match];
-			else if (devinfo->devnames[0][0] != '\0' &&
-				 devinfo->devnames[1][0] == '\0')
+				devname = devinfo->udi_devnames[match];
+			else if (devinfo->udi_devnames[0][0] != '\0' &&
+				 devinfo->udi_devnames[1][0] == '\0')
 				/* if we have exactly 1 device name */
-				devname = devinfo->devnames[0];
+				devname = devinfo->udi_devnames[0];
 
 			if (verbose) {
 				printf("%s: Found action '%s' for %s, %s",
 					__progname, action->name,
-					devinfo->product, devinfo->vendor);
+					devinfo->udi_product, devinfo->udi_vendor);
 				if (devname)
 					printf(" at %s", devname);
 				printf("\n");
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 26196ec3f692b..1d085b7e35481 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -78,7 +78,7 @@ usbdev(int f, int a, int rec)
 	struct usb_device_info di;
 	int e, p, i;
 
-	di.addr = a;
+	di.udi_addr = a;
 	e = ioctl(f, USB_DEVICEINFO, &di);
 	if (e) {
 		if (errno != ENXIO)
@@ -88,38 +88,38 @@ usbdev(int f, int a, int rec)
 	printf("addr %d: ", a);
 	done[a] = 1;
 	if (verbose) {
-		switch (di.speed) {
+		switch (di.udi_speed) {
 		case USB_SPEED_LOW:  printf("low speed, "); break;
 		case USB_SPEED_FULL: printf("full speed, "); break;
 		case USB_SPEED_HIGH: printf("high speed, "); break;
 		default: break;
 		}
-		if (di.power)
-			printf("power %d mA, ", di.power);
+		if (di.udi_power)
+			printf("power %d mA, ", di.udi_power);
 		else
 			printf("self powered, ");
-		if (di.config)
-			printf("config %d, ", di.config);
+		if (di.udi_config)
+			printf("config %d, ", di.udi_config);
 		else
 			printf("unconfigured, ");
 	}
 	if (verbose) {
 		printf("%s(0x%04x), %s(0x%04x), rev %s",
-		       di.product, di.productNo,
-		       di.vendor, di.vendorNo, di.release);
+		       di.udi_product, di.udi_productNo,
+		       di.udi_vendor, di.udi_vendorNo, di.udi_release);
 	} else
-		printf("%s, %s", di.product, di.vendor);
+		printf("%s, %s", di.udi_product, di.udi_vendor);
 	printf("\n");
 	if (showdevs) {
 		for (i = 0; i < USB_MAX_DEVNAMES; i++)
-			if (di.devnames[i][0])
+			if (di.udi_devnames[i][0])
 				printf("%*s  %s\n", indent, "",
-				       di.devnames[i]);
+				       di.udi_devnames[i]);
 	}
 	if (!rec)
 		return;
-	for (p = 0; p < di.nports; p++) {
-		int s = di.ports[p];
+	for (p = 0; p < di.udi_nports; p++) {
+		int s = di.udi_ports[p];
 		if (s >= USB_MAX_DEVICES) {
 			if (verbose) {
 				printf("%*sport %d %s\n", indent+1, "", p+1,
-- 
cgit v1.3


From d397408818fbfa179246fb327659e3fb29ffff31 Mon Sep 17 00:00:00 2001
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 22 Apr 2002 13:44:47 +0000
Subject: Usage style sweep: spell "usage" with a small 'u'. Also change one
 case of blatant __progname abuse (several more remain) This commit does not
 touch anything in src/{contrib,crypto,gnu}/.

---
 bin/sh/options.c                        |  2 +-
 etc/rc.d/wscons                         |  2 +-
 etc/rc.sendmail                         |  2 +-
 etc/rc.subr                             |  2 +-
 games/adventure/setup.c                 |  2 +-
 games/atc/main.c                        |  2 +-
 games/backgammon/common_source/subs.c   |  2 +-
 games/bs/bs.c                           |  2 +-
 games/canfield/cfscores/cfscores.c      |  2 +-
 lib/libc_r/test/guard_b.c               |  2 +-
 lib/libedit/makelist                    |  2 +-
 lib/libkse/test/guard_b.c               |  2 +-
 lib/libpthread/test/guard_b.c           |  2 +-
 libexec/pppoed/pppoed.c                 |  2 +-
 release/picobsd/tinyware/msh/sh3.c      |  2 +-
 release/scripts/driver-copy2.pl         |  2 +-
 release/scripts/driver-remove.pl        |  2 +-
 sbin/fsck/fsck.c                        |  2 +-
 sbin/fsck_ffs/main.c                    |  2 +-
 sbin/fsck_ifs/main.c                    |  2 +-
 sbin/fsck_msdosfs/main.c                |  2 +-
 sbin/mdconfig/mdconfig.c                |  2 +-
 sbin/mdmfs/mdmfs.c                      |  4 ++--
 sbin/vinum/commands.c                   | 22 +++++++++++-----------
 sbin/vinum/list.c                       |  2 +-
 share/examples/isdn/contrib/answer.c    |  2 +-
 share/examples/isdn/contrib/isdnctl     |  2 +-
 share/examples/netgraph/ether.bridge    |  2 +-
 sys/kern/makesyscalls.sh                |  2 +-
 tools/diag/localeck/localeck.c          |  2 +-
 tools/regression/geom/ConfCmp/ConfCmp.c |  2 +-
 tools/regression/p1003_1b/yield.c       |  2 +-
 usr.bin/doscmd/config.c                 | 26 +++++++++++++-------------
 usr.bin/fetch/fetch.c                   |  2 +-
 usr.bin/fmt/fmt.c                       |  2 +-
 usr.bin/hesinfo/hesinfo.c               |  3 +--
 usr.bin/mklocale/yacc.y                 |  2 +-
 usr.bin/objformat/objformat.c           |  2 +-
 usr.bin/passwd/passwd.c                 |  2 +-
 usr.bin/rpcinfo/rpcinfo.c               |  2 +-
 usr.bin/sockstat/sockstat.pl            |  2 +-
 usr.bin/telnet/commands.c               |  2 +-
 usr.bin/telnet/main.c                   |  2 +-
 usr.bin/usbhidctl/usbhid.c              |  2 +-
 usr.bin/xlint/lint1/main1.c             |  2 +-
 usr.bin/xlint/xlint/xlint.c             |  2 +-
 usr.sbin/burncd/burncd.c                |  2 +-
 usr.sbin/crunch/crunchide/crunchide.c   |  2 +-
 usr.sbin/ctm/ctm_rmail/options.h        |  2 +-
 usr.sbin/digictl/digictl.c              |  2 +-
 usr.sbin/jail/jail.c                    |  2 +-
 usr.sbin/kldxref/kldxref.c              |  2 +-
 usr.sbin/lpr/lpc/cmds.c                 |  6 +++---
 usr.sbin/ngctl/main.c                   |  2 +-
 usr.sbin/pccard/pccardc/beep.c          |  2 +-
 usr.sbin/pccard/pccardc/power.c         |  2 +-
 usr.sbin/pcvt/userkeys/vt220keys.c      |  2 +-
 usr.sbin/ppp/command.c                  |  4 ++--
 usr.sbin/ppp/main.c                     |  2 +-
 usr.sbin/ppp/nat_cmd.c                  | 10 +++++-----
 usr.sbin/ppp/systems.c                  |  2 +-
 usr.sbin/pppstats/pppstats.c            |  2 +-
 usr.sbin/rip6query/rip6query.c          |  2 +-
 usr.sbin/usbd/usbd.c                    |  2 +-
 usr.sbin/usbdevs/usbdevs.c              |  2 +-
 65 files changed, 95 insertions(+), 96 deletions(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/bin/sh/options.c b/bin/sh/options.c
index 5a3ba34fc4dc5..dbcb67e7d4836 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -373,7 +373,7 @@ getoptscmd(int argc, char **argv)
 	char **optbase = NULL;
 
 	if (argc < 3)
-		error("Usage: getopts optstring var [arg]");
+		error("usage: getopts optstring var [arg]");
 	else if (argc == 3)
 		optbase = shellparam.p;
 	else
diff --git a/etc/rc.d/wscons b/etc/rc.d/wscons
index a8a7398b37059..ecbc48aba6b39 100755
--- a/etc/rc.d/wscons
+++ b/etc/rc.d/wscons
@@ -18,7 +18,7 @@ wscons_start()
 	wscfg=/usr/sbin/wsconscfg
 	wsfld=/usr/sbin/wsfontload
 	config=/etc/wscons.conf
-	usage="Usage: wsconfig [-n] [-f configfile] [-font fontpgm] [-screen screenpgm]"
+	usage="usage: wsconfig [-n] [-f configfile] [-font fontpgm] [-screen screenpgm]"
 	DOIT=
 
 	while [ $# -gt 0 ]; do
diff --git a/etc/rc.sendmail b/etc/rc.sendmail
index 4f8a2cab1cde5..74dde31883db3 100644
--- a/etc/rc.sendmail
+++ b/etc/rc.sendmail
@@ -184,7 +184,7 @@ restart-mspq)
 	;;
 
 *)
-	echo "Usage: `basename $0` {start|stop|restart}" >&2
+	echo "usage: `basename $0` {start|stop|restart}" >&2
 	echo "       `basename $0` {start-mta|stop-mta|restart-mta}" >&2
 	echo "       `basename $0` {start-mspq|stop-mspq|restart-mspq}" >&2
 	exit 64
diff --git a/etc/rc.subr b/etc/rc.subr
index 5292a3271b243..f30076085e83b 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -550,7 +550,7 @@ load_rc_config()
 #
 rc_usage()
 {
-	echo -n 1>&2 "Usage: $0 [fast|force]("
+	echo -n 1>&2 "usage: $0 [fast|force]("
 
 	_sep=
 	for _elem in $*; do
diff --git a/games/adventure/setup.c b/games/adventure/setup.c
index f68e1c123a6f8..587de58e10e30 100644
--- a/games/adventure/setup.c
+++ b/games/adventure/setup.c
@@ -66,7 +66,7 @@ static const char rcsid[] =
 #include <err.h>
 #include "hdr.h"        /* SEED lives in there; keep them coordinated. */
 
-#define USAGE "Usage: setup file > data.c (file is typically glorkz)"
+#define USAGE "usage: setup file > data.c (file is typically glorkz)"
 
 #define YES 1
 #define NO  0
diff --git a/games/atc/main.c b/games/atc/main.c
index 6319a7aad75c1..6a10ca63e9333 100644
--- a/games/atc/main.c
+++ b/games/atc/main.c
@@ -130,7 +130,7 @@ main(ac, av)
 
 	if (f_usage)
 		fprintf(stderr,
-		    "Usage: %s -[u?lstp] [-[gf] game_name] [-r random seed]\n",
+		    "usage: %s -[u?lstp] [-[gf] game_name] [-r random seed]\n",
 			name);
 	if (f_showscore)
 		log_score(1);
diff --git a/games/backgammon/common_source/subs.c b/games/backgammon/common_source/subs.c
index 15af00861a8ce..3a1c5998be5f9 100644
--- a/games/backgammon/common_source/subs.c
+++ b/games/backgammon/common_source/subs.c
@@ -52,7 +52,7 @@ static const char	plwhite[] = "Player is white, computer is red.";
 static const char	nocomp[] = "(No computer play.)";
 
 const char  *const descr[] = {
-	"Usage:  backgammon [-h n r w b pr pw pb tterm sfile]\n",
+	"usage: backgammon [-h n r w b pr pw pb tterm sfile]\n",
 	"\t-h\tgets this list\n\t-n\tdon't ask for rules or instructions",
 	"\t-r\tplayer is red (implies -n)\n\t-w\tplayer is white (implies -n)",
 	"\t-b\ttwo players, red and white (implies -n)",
diff --git a/games/bs/bs.c b/games/bs/bs.c
index 5ccaa3eb1b6e6..4a16379988b69 100644
--- a/games/bs/bs.c
+++ b/games/bs/bs.c
@@ -1124,7 +1124,7 @@ char *op[];
 	    {
 	    default:
 	    case '?':
-		(void) fprintf(stderr, "Usage: battle [-s | -b] [-c]\n");
+		(void) fprintf(stderr, "usage: battle [-s | -b] [-c]\n");
 		(void) fprintf(stderr, "\tWhere the options are:\n");
 		(void) fprintf(stderr, "\t-s : play a salvo game\n");
 		(void) fprintf(stderr, "\t-b : play a blitz game\n");
diff --git a/games/canfield/cfscores/cfscores.c b/games/canfield/cfscores/cfscores.c
index de07283d45e37..c13b90525799f 100644
--- a/games/canfield/cfscores/cfscores.c
+++ b/games/canfield/cfscores/cfscores.c
@@ -76,7 +76,7 @@ main(argc, argv)
 	int uid;
 
 	if (argc > 2) {
-		printf("Usage: cfscores [user]\n");
+		printf("usage: cfscores [user]\n");
 		exit(1);
 	}
 	dbfd = open(_PATH_SCORE, O_RDONLY);
diff --git a/lib/libc_r/test/guard_b.c b/lib/libc_r/test/guard_b.c
index e2f1a3aa33f78..42bf4edd3bbbe 100644
--- a/lib/libc_r/test/guard_b.c
+++ b/lib/libc_r/test/guard_b.c
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 	struct args	args;
 
 	if (argc != 3) {
-		fprintf(stderr, "Usage: guard_b <stacksize> <guardsize>\n");
+		fprintf(stderr, "usage: guard_b <stacksize> <guardsize>\n");
 		exit(1);
 	}
 	fprintf(stderr, "Test begin\n");
diff --git a/lib/libedit/makelist b/lib/libedit/makelist
index 8ab0588e418a3..8c555233b7b8d 100644
--- a/lib/libedit/makelist
+++ b/lib/libedit/makelist
@@ -41,7 +41,7 @@
 # makelist.sh: Automatically generate header files...
 
 AWK=/usr/bin/awk
-USAGE="Usage: $0 -h|-e|-fc|-fh|-bc|-bh|-m <filenames>"
+USAGE="usage: $0 -h|-e|-fc|-fh|-bc|-bh|-m <filenames>"
 
 if [ "x$1" = "x" ]
 then
diff --git a/lib/libkse/test/guard_b.c b/lib/libkse/test/guard_b.c
index e2f1a3aa33f78..42bf4edd3bbbe 100644
--- a/lib/libkse/test/guard_b.c
+++ b/lib/libkse/test/guard_b.c
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 	struct args	args;
 
 	if (argc != 3) {
-		fprintf(stderr, "Usage: guard_b <stacksize> <guardsize>\n");
+		fprintf(stderr, "usage: guard_b <stacksize> <guardsize>\n");
 		exit(1);
 	}
 	fprintf(stderr, "Test begin\n");
diff --git a/lib/libpthread/test/guard_b.c b/lib/libpthread/test/guard_b.c
index e2f1a3aa33f78..42bf4edd3bbbe 100644
--- a/lib/libpthread/test/guard_b.c
+++ b/lib/libpthread/test/guard_b.c
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 	struct args	args;
 
 	if (argc != 3) {
-		fprintf(stderr, "Usage: guard_b <stacksize> <guardsize>\n");
+		fprintf(stderr, "usage: guard_b <stacksize> <guardsize>\n");
 		exit(1);
 	}
 	fprintf(stderr, "Test begin\n");
diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index 63f7325b57e18..55616f18a8ed4 100644
--- a/libexec/pppoed/pppoed.c
+++ b/libexec/pppoed/pppoed.c
@@ -71,7 +71,7 @@ static int ReceivedSignal;
 static int
 usage(const char *prog)
 {
-  fprintf(stderr, "Usage: %s [-Fd] [-P pidfile] [-a name] [-e exec | -l label]"
+  fprintf(stderr, "usage: %s [-Fd] [-P pidfile] [-a name] [-e exec | -l label]"
           " [-p provider] interface\n", prog);
   return EX_USAGE;
 }
diff --git a/release/picobsd/tinyware/msh/sh3.c b/release/picobsd/tinyware/msh/sh3.c
index 5959f27354245..9aa61d2abf390 100644
--- a/release/picobsd/tinyware/msh/sh3.c
+++ b/release/picobsd/tinyware/msh/sh3.c
@@ -818,7 +818,7 @@ struct op *t;
 	register int  nl = 0;
 
 	if (t->words[1] == NULL) {
-		err("Usage: read name ...");
+		err("usage: read name ...");
 		return(1);
 	}
 	for (wp = t->words+1; *wp; wp++) {
diff --git a/release/scripts/driver-copy2.pl b/release/scripts/driver-copy2.pl
index 541e3e093f32f..6c4dfe6e82edb 100644
--- a/release/scripts/driver-copy2.pl
+++ b/release/scripts/driver-copy2.pl
@@ -28,7 +28,7 @@
 # 
 
 if ($#ARGV != 2) {
-    print STDERR "Usage: driver-copy.pl config_file src_ko_dir dst_ko_dir\n";
+    print STDERR "usage: driver-copy.pl config_file src_ko_dir dst_ko_dir\n";
     exit 1;
 }
 
diff --git a/release/scripts/driver-remove.pl b/release/scripts/driver-remove.pl
index 2ff5a8886d655..aa8ec1c6851ff 100644
--- a/release/scripts/driver-remove.pl
+++ b/release/scripts/driver-remove.pl
@@ -28,7 +28,7 @@
 # 
 
 if ($#ARGV != 1) {
-    print STDERR "Usage: driver-remove.pl config_file BOOTMFS\n";
+    print STDERR "usage: driver-remove.pl config_file BOOTMFS\n";
     exit 1;
 }
 
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 6b913bc70c83c..fdc3ae0ea2590 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -582,7 +582,7 @@ usage(void)
 	static const char common[] =
 	    "[-BFdpvlyn] [-T fstype:fsoptions] [-t fstype]";
 
-	(void)fprintf(stderr, "Usage: %s %s [special|node]...\n",
+	(void)fprintf(stderr, "usage: %s %s [special|node]...\n",
 	    getprogname(), common);
 	exit(1);
 }
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 55e25c3692300..eaf90dd3cb02b 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -498,7 +498,7 @@ static void
 usage(void)
 {
         (void) fprintf(stderr,
-            "Usage: %s [-BFpfny] [-b block] [-c level] [-m mode] "
+            "usage: %s [-BFpfny] [-b block] [-c level] [-m mode] "
                         "filesystem ...\n",
             getprogname());
         exit(1);
diff --git a/sbin/fsck_ifs/main.c b/sbin/fsck_ifs/main.c
index 356d90f22c13d..52263b97212ec 100644
--- a/sbin/fsck_ifs/main.c
+++ b/sbin/fsck_ifs/main.c
@@ -398,7 +398,7 @@ static void
 usage(void)
 {
         (void) fprintf(stderr,
-            "Usage: %s [-dfnpy] [-B be|le] [-b block] [-c level] [-m mode] "
+            "usage: %s [-dfnpy] [-B be|le] [-b block] [-c level] [-m mode] "
                         "filesystem ...\n",
             getprogname());
         exit(1);
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index 110b360a7fa0a..cbfe6da7128bc 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -59,7 +59,7 @@ static void usage(void) __dead2;
 static void
 usage()
 {
-	errexit("Usage: fsck_msdos [-fnpy] filesystem ... \n");
+	errexit("usage: fsck_msdos [-fnpy] filesystem ... \n");
 }
 
 int
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 8a6019f008ce3..a73033242c9cc 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -36,7 +36,7 @@ enum {UNSET, ATTACH, DETACH, LIST} action = UNSET;
 void
 usage()
 {
-	fprintf(stderr, "Usage:\n");
+	fprintf(stderr, "usage:\n");
 	fprintf(stderr, "\tmdconfig -a -t type [-o [no]option]... [ -f file] [-s size] [-u unit]\n");
 	fprintf(stderr, "\tmdconfig -d -u unit\n");
 	fprintf(stderr, "\tmdconfig -l [-u unit]\n");
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index 9c59db7e666e2..53e772ee9ffbe 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -676,13 +676,13 @@ usage(void)
 		name = "mdmfs";
 	if (!compat)
 		fprintf(stderr,
-"Usage: %s [-DLMNSUX] [-a maxcontig [-b block-size] [-c cylinders]\n"
+"usage: %s [-DLMNSUX] [-a maxcontig [-b block-size] [-c cylinders]\n"
 "\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"
 "\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"
 "\t[-o mount-options] [-p permissions] [-s size] [-w user:group]\n"
 "\tmd-device mount-point\n", name);
 	fprintf(stderr,
-"Usage: %s -C [-NU] [-a maxcontig] [-b block-size] [-c cylinders]\n"
+"usage: %s -C [-NU] [-a maxcontig] [-b block-size] [-c cylinders]\n"
 "\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"
 "\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"
 "\t[-o mount-options] [-s size] md-device mount-point\n", name);
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index ff8acd8d5f795..011df59d3f3bd 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -173,7 +173,7 @@ vinum_read(int argc, char *argv[], char *arg0[])
 
     reply = (struct _ioctl_reply *) &buffer;
     if (argc < 1) {					    /* wrong arg count */
-	fprintf(stderr, "Usage: read drive [drive ...]\n");
+	fprintf(stderr, "usage: read drive [drive ...]\n");
 	return;
     }
     strcpy(buffer, "read ");
@@ -241,7 +241,7 @@ vinum_rm(int argc, char *argv[], char *arg0[])
     struct vinum_ioctl_msg *message = (struct vinum_ioctl_msg *) &reply;
 
     if (argc == 0)					    /* start everything */
-	fprintf(stderr, "Usage: rm object [object...]\n");
+	fprintf(stderr, "usage: rm object [object...]\n");
     else {						    /* start specified objects */
 	int index;
 	enum objecttype type;
@@ -933,7 +933,7 @@ vinum_attach(int argc, char *argv[], char *argv0[])
     if ((argc < 2)
 	|| (argc > 4)) {
 	fprintf(stderr,
-	    "Usage: \tattach <subdisk> <plex> [rename] [<plexoffset>]\n"
+	    "usage: \tattach <subdisk> <plex> [rename] [<plexoffset>]\n"
 	    "\tattach <plex> <volume> [rename]\n");
 	return;
     }
@@ -1055,7 +1055,7 @@ vinum_detach(int argc, char *argv[], char *argv0[])
     if ((argc < 1)
 	|| (argc > 2)) {
 	fprintf(stderr,
-	    "Usage: \tdetach <subdisk> [rename]\n"
+	    "usage: \tdetach <subdisk> [rename]\n"
 	    "\tdetach <plex> [rename]\n");
 	return;
     }
@@ -1196,7 +1196,7 @@ void
 vinum_rename(int argc, char *argv[], char *argv0[])
 {
     if (argc != 2) {
-	fprintf(stderr, "Usage: \trename <object> <new name>\n");
+	fprintf(stderr, "usage: \trename <object> <new name>\n");
 	return;
     }
     if (ioctl(superdev, VINUM_GETCONFIG, &vinum_conf) < 0) {
@@ -1225,7 +1225,7 @@ vinum_mv(int argc, char *argv[], char *argv0[])
     struct vinum_ioctl_msg *msg = (struct vinum_ioctl_msg *) &reply;
 
     if (argc < 2) {
-	fprintf(stderr, "Usage: \tmove <dest> <src> ...\n");
+	fprintf(stderr, "usage: \tmove <dest> <src> ...\n");
 	return;
     }
     /* Get current config */
@@ -1433,7 +1433,7 @@ vinum_setdaemon(int argc, char *argv[], char *argv0[])
 	break;
 
     default:
-	fprintf(stderr, "Usage: \tsetdaemon [<bitmask>]\n");
+	fprintf(stderr, "usage: \tsetdaemon [<bitmask>]\n");
     }
     checkupdates();					    /* make sure we're updating */
 }
@@ -1445,7 +1445,7 @@ vinum_saveconfig(int argc, char *argv[], char *argv0[])
     int ioctltype;
 
     if (argc != 0) {
-	printf("Usage: saveconfig\n");
+	printf("usage: saveconfig\n");
 	return;
     }
     ioctltype = 1;					    /* user saveconfig */
@@ -2248,7 +2248,7 @@ vinum_readpol(int argc, char *argv[], char *argv0[])
     int plexno;
 
     if (argc == 0) {					    /* start everything */
-	fprintf(stderr, "Usage: readpol <volume> <plex>|round\n");
+	fprintf(stderr, "usage: readpol <volume> <plex>|round\n");
 	return;
     }
     object = find_object(argv[1], &type);		    /* look for it */
@@ -2360,7 +2360,7 @@ vinum_checkparity(int argc, char *argv[], char *argv0[])
 {
     Verbose = vflag;					    /* accept -v for verbose */
     if (argc == 0)					    /* no parameters? */
-	fprintf(stderr, "Usage: checkparity object [object...]\n");
+	fprintf(stderr, "usage: checkparity object [object...]\n");
     else
 	parityops(argc, argv, checkparity);
 }
@@ -2369,7 +2369,7 @@ void
 vinum_rebuildparity(int argc, char *argv[], char *argv0[])
 {
     if (argc == 0)					    /* no parameters? */
-	fprintf(stderr, "Usage: rebuildparity object [object...]\n");
+	fprintf(stderr, "usage: rebuildparity object [object...]\n");
     else
 	parityops(argc, argv, vflag ? rebuildandcheckparity : rebuildparity);
 }
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index 24dc35e02807e..d7b4ff8df96dd 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -1031,7 +1031,7 @@ vinum_printconfig(int argc, char *argv[], char *argv0[])
     FILE *of;
 
     if (argc > 1) {
-	fprintf(stderr, "Usage: \tprintconfig [<outfile>]\n");
+	fprintf(stderr, "usage: \tprintconfig [<outfile>]\n");
 	return;
     } else if (argc == 1)
 	of = fopen(argv[0], "w");
diff --git a/share/examples/isdn/contrib/answer.c b/share/examples/isdn/contrib/answer.c
index da19aa946fd7b..aac431f17e014 100644
--- a/share/examples/isdn/contrib/answer.c
+++ b/share/examples/isdn/contrib/answer.c
@@ -74,7 +74,7 @@ void readFromPhone (char *path)
 
 void usage (void)
 {
-	fprintf(stderr,"Usage: answer -D device -d destination -s source\n");
+	fprintf(stderr,"usage: answer -D device -d destination -s source\n");
 	exit(1); 
 }
 
diff --git a/share/examples/isdn/contrib/isdnctl b/share/examples/isdn/contrib/isdnctl
index f9de44fbb8344..57fab4561cc6a 100644
--- a/share/examples/isdn/contrib/isdnctl
+++ b/share/examples/isdn/contrib/isdnctl
@@ -24,7 +24,7 @@
 
 
 usage () {
-	echo "Usage: $0 [-i interface] [-f /path/to/users.file] [up|down|show]"
+	echo "usage: $0 [-i interface] [-f /path/to/users.file] [up|down|show]"
 }
 
 # Defaults
diff --git a/share/examples/netgraph/ether.bridge b/share/examples/netgraph/ether.bridge
index acc4a4d1e6ff5..273e4c4c26d04 100644
--- a/share/examples/netgraph/ether.bridge
+++ b/share/examples/netgraph/ether.bridge
@@ -167,7 +167,7 @@ case $1 in
 		bridge_stop
 		;;
 	*)
-		echo "Usage: ether.bridge [ start | stop | stats ]"
+		echo "usage: ether.bridge [ start | stop | stats ]"
 		exit 1
 esac
 
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 3277c26041eea..f4a0212f02929 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -31,7 +31,7 @@ trap "rm $sysdcl $syscompat $syscompatdcl $sysent $sysinc $sysarg" 0
 touch $sysdcl $syscompat $syscompatdcl $sysent $sysinc $sysarg
 
 case $# in
-    0)	echo "Usage: $0 input-file <config-file>" 1>&2
+    0)	echo "usage: $0 input-file <config-file>" 1>&2
 	exit 1
 	;;
 esac
diff --git a/tools/diag/localeck/localeck.c b/tools/diag/localeck/localeck.c
index b638f0057253b..4ce7e458f147d 100644
--- a/tools/diag/localeck/localeck.c
+++ b/tools/diag/localeck/localeck.c
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
 	const char *localename;
 
 	if (argc != 2) {
-		(void)fprintf(stderr, "Usage: localeck <locale_name>\n");
+		(void)fprintf(stderr, "usage: localeck <locale_name>\n");
 		exit(1);
 	}
 
diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/tools/regression/geom/ConfCmp/ConfCmp.c
index e224db927ff1f..dd129bab128bf 100644
--- a/tools/regression/geom/ConfCmp/ConfCmp.c
+++ b/tools/regression/geom/ConfCmp/ConfCmp.c
@@ -308,7 +308,7 @@ main(int argc, char **argv)
 	setbuf(stdout, NULL);
 	setbuf(stderr, NULL);
 	if (argc != 3)
-		errx(1, "Usage: %s file1 file2", argv[0]);
+		errx(1, "usage: %s file1 file2", argv[0]);
 
 	t1 = dofile(argv[1]);
 	if (t1 == NULL)
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index b664513979744..ac31a99f250ac 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -82,7 +82,7 @@ int yield(int argc, char *argv[])
 		n = nslaves = 10;
 
 	else if (argc != 2) {
-		fprintf(stderr, "Usage: prog [n_instances]\n");
+		fprintf(stderr, "usage: prog [n_instances]\n");
 		exit(-1);
 	}
 	else
diff --git a/usr.bin/doscmd/config.c b/usr.bin/doscmd/config.c
index 0c3b2f00d4dac..bb43a1fc6cf58 100644
--- a/usr.bin/doscmd/config.c
+++ b/usr.bin/doscmd/config.c
@@ -106,7 +106,7 @@ read_config(FILE *fp)
     	    int ro = 0;
 
     	    if (ac < 2) {
-		fprintf(stderr, "Usage: assign device ...\n");
+		fprintf(stderr, "usage: assign device ...\n");
 		quit(1);
 	    }
 	    if (av[2] && !strcasecmp(av[2], "-ro")) {
@@ -119,7 +119,7 @@ read_config(FILE *fp)
 	    if (!strncasecmp(av[1], "lpt", 3)) {
 		if (av[1][3] < '1' || av[1][3] > '4'
 				   || av[1][4] != ':' || ac < 3) {
-		    fprintf(stderr, "Usage: assign lptn: [direct] lpr-name [ time-out]\n");
+		    fprintf(stderr, "usage: assign lptn: [direct] lpr-name [ time-out]\n");
 		    quit(1);
 		}
 		printer = av[1][3] - '1';
@@ -136,7 +136,7 @@ read_config(FILE *fp)
 		}
 	    } else if (!strncasecmp(av[1], "flop", 4)) {
 		if (ac != 4) {
-		    fprintf(stderr, "Usage: assign flop [-ro] file type\n");
+		    fprintf(stderr, "usage: assign flop [-ro] file type\n");
 		    quit(1);
 		}
 
@@ -161,7 +161,7 @@ init_soft:
 init_hard:
 		switch (ac) {
 		default:
-		    fprintf(stderr, "Usage: assign [A-Z]: [-ro] directory\n"
+		    fprintf(stderr, "usage: assign [A-Z]: [-ro] directory\n"
 			            "       assign hard [-ro] file type [boot_sector]\n"
 		    		    "       assign hard [-ro] file cylinders heads sectors/track [boot_sector]\n");
 		    quit(1);
@@ -185,7 +185,7 @@ init_hard:
 		}
 	    } else if (av[1][1] == ':') {
 		if (av[1][2] || !isalpha(av[1][0])) {
-		    fprintf(stderr, "Usage: assign [A-Z]: ...\n");
+		    fprintf(stderr, "usage: assign [A-Z]: ...\n");
 		    quit(1);
 		}
                 drive = drlton(av[1][0]);
@@ -204,31 +204,31 @@ init_hard:
                 unsigned char irq;
  
                 if ((ac != 5) || (!isdigit(av[1][3]))) {
-                    fprintf(stderr, "Usage: assign com[1-4] path addr irq\n");
+                    fprintf(stderr, "usage: assign com[1-4] path addr irq\n");
                     quit(1);
                 }
                 port = atoi(&av[1][3]) - 1;
                 if ((port < 0) || (port > (N_COMS_MAX - 1))) {
-                    fprintf(stderr, "Usage: assign com[1-4] path addr irq\n");
+                    fprintf(stderr, "usage: assign com[1-4] path addr irq\n");
                     quit(1);
                 }
                 errno = 0;
                 addr = (int)strtol(av[3], '\0', 0);
                 /* XXX DEBUG ISA-specific */
                 if ((errno != 0) || (addr > MAXPORT)) {
-                    fprintf(stderr, "Usage: assign com[1-4] path addr irq\n");
+                    fprintf(stderr, "usage: assign com[1-4] path addr irq\n");
                     quit(1);
                 }
                 errno = 0;
                 irq = (unsigned char)strtol(av[4], '\0', 0);
                 /* XXX DEBUG ISA-specific */
                 if ((errno != 0) || (irq < 2) || (irq > 7)) {
-                    fprintf(stderr, "Usage: assign com[1-4] path addr irq[2-7]\n");
+                    fprintf(stderr, "usage: assign com[1-4] path addr irq[2-7]\n");
                     quit(1);
                 }
                 init_com(port, av[2], addr, irq);
 	    } else {
-		fprintf(stderr, "Usage: assign flop ...\n");
+		fprintf(stderr, "usage: assign flop ...\n");
 		fprintf(stderr, "       assign hard ...\n");
 		fprintf(stderr, "       assign [A-Z]: ...\n");
 		fprintf(stderr, "       assign comX ...\n");
@@ -236,7 +236,7 @@ init_hard:
 	    }
     	} else if (!strcasecmp(av[0], "boot")) {
 	    if (ac != 2 || av[1][2] || !isalpha(av[1][0])) {
-		fprintf(stderr, "Usage: boot [A: | C:]\n");
+		fprintf(stderr, "usage: boot [A: | C:]\n");
 		quit(1);
 	    }
             bootdrive = drlton(av[1][0]);
@@ -248,7 +248,7 @@ init_hard:
 	    int p, c;
 	    if (ac < 2 || ac > 3 || !isdigit(av[1][0]) ||
 		    (ac == 3 && !isdigit(av[2][0]))) {
-		fprintf(stderr, "Usage: portmap port [count]\n");
+		fprintf(stderr, "usage: portmap port [count]\n");
 		quit(1);
 	    }
 	    p = strtol(av[1], 0, 0);
@@ -262,7 +262,7 @@ init_hard:
     	} else if (!strcasecmp(av[0], "setver")) {
 	    int v;
 	    if (ac != 3 || !(v = strtol(av[2], 0, 0))) {
-		fprintf(stderr, "Usage: setver command version\n");
+		fprintf(stderr, "usage: setver command version\n");
 		quit(1);
 	    }
     	    setver(av[1], v);
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c
index ed49a8d6dfc41..d5791b79cec24 100644
--- a/usr.bin/fetch/fetch.c
+++ b/usr.bin/fetch/fetch.c
@@ -621,7 +621,7 @@ static void
 usage(void)
 {
 	fprintf(stderr, "%s\n%s\n%s\n",
-	    "Usage: fetch [-146AFMPRUadlmnpqrsv] [-o outputfile] [-S bytes]",
+	    "usage: fetch [-146AFMPRUadlmnpqrsv] [-o outputfile] [-S bytes]",
 	    "             [-B bytes] [-T seconds] [-w seconds]",
 	    "             [-h host -f file [-c dir] | URL ...]");
 }
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index f7ea0ab0ad5b3..6215cfae45b4f 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -308,7 +308,7 @@ main(int argc, char *argv[]) {
       continue;
     case 'h': default:
       fprintf(stderr,
-"Usage:   fmt [-cmps] [-d chars] [-l num] [-t num]\n"
+"usage:   fmt [-cmps] [-d chars] [-l num] [-t num]\n"
 "             [-w width | -width | goal [maximum]] [file ...]\n"
 "Options: -c     center each line instead of formatting\n"
 "         -d <chars> double-space after <chars> at line end\n"
diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c
index 206f28bd03d2d..717b915c27e3f 100644
--- a/usr.bin/hesinfo/hesinfo.c
+++ b/usr.bin/hesinfo/hesinfo.c
@@ -33,7 +33,6 @@ static const char rcsid[] =
 #include <unistd.h>
 
 int	main(int, char **);
-extern char *__progname;
 
 int 
 main(argc, argv)
@@ -58,7 +57,7 @@ main(argc, argv)
 		}
 	}
 	if (argc - optind != 2 || errflg) {
-		fprintf(stderr, "Usage: %s [-bl] name type\n", __progname);
+		fprintf(stderr, "usage: hesinfo [-bl] name type\n");
 		fprintf(stderr, "\t-l selects long format\n");
 		fprintf(stderr, "\t-b also does hes_to_bind conversion\n");
 		exit(2);
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 51378f144e3de..3001490af9951 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -211,7 +211,7 @@ main(ac, av)
 	    break;
 	default:
 	usage:
-	    fprintf(stderr, "Usage: mklocale [-d] [-o output] [source]\n");
+	    fprintf(stderr, "usage: mklocale [-d] [-o output] [source]\n");
 	    exit(1);
 	}
     }
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index 3e9e4101d0e5c..1b3e35d7f2859 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -52,7 +52,7 @@ main(int argc, char **argv)
 
 	if (strcmp(cmd, "objformat") == 0) {
 		if (argc != 1) {
-			fprintf(stderr, "Usage: objformat\n");
+			fprintf(stderr, "usage: objformat\n");
 			exit(1);
 		}
 		printf("%s\n", objformat);
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 28119dd5ff6ee..5648f1a499dc7 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -57,7 +57,7 @@ static char	*yp_host;
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: passwd [-ly] [-d domain] [-h host] [user]\n");
+	fprintf(stderr, "usage: passwd [-ly] [-d domain] [-h host] [user]\n");
 	exit(1);
 }
 
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 6ae9d4f6d40a5..f184fdc7d435c 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -1499,7 +1499,7 @@ progping(char *netid, int argc, char **argv)
 static void
 usage()
 {
-	fprintf(stderr, "Usage: rpcinfo [-m | -s] [host]\n");
+	fprintf(stderr, "usage: rpcinfo [-m | -s] [host]\n");
 #ifdef PORTMAP
 	fprintf(stderr, "       rpcinfo -p [host]\n");
 #endif
diff --git a/usr.bin/sockstat/sockstat.pl b/usr.bin/sockstat/sockstat.pl
index 16653c5872f3f..6d1ac0f2d5508 100644
--- a/usr.bin/sockstat/sockstat.pl
+++ b/usr.bin/sockstat/sockstat.pl
@@ -211,7 +211,7 @@ sub print_unix($$) {
 # Print usage message and exit
 #
 sub usage() {
-    print(STDERR "Usage: sockstat [-46clu] [-p ports]\n");
+    print(STDERR "usage: sockstat [-46clu] [-p ports]\n");
     exit(1);
 }
 
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index 9ec649e1d79b5..d5eda3196795c 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -438,7 +438,7 @@ send_tncmd(void (*func)(int, int), const char *cmd, char *name)
     if (isprefix(name, "help") || isprefix(name, "?")) {
 	int col, len;
 
-	printf("Usage: send %s <value|option>\n", cmd);
+	printf("usage: send %s <value|option>\n", cmd);
 	printf("\"value\" must be from 0 to 255\n");
 	printf("Valid options are:\n\t");
 
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index 5c7366412ca8a..6276fdd7deade 100644
--- a/usr.bin/telnet/main.c
+++ b/usr.bin/telnet/main.c
@@ -84,7 +84,7 @@ tninit(void)
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: %s %s%s%s%s\n",
+	fprintf(stderr, "usage: %s %s%s%s%s\n",
 	    prompt,
 	    "[-4] [-6] [-8] [-E] [-L] [-N] [-S tos] [-c] [-d]",
 	    "\n\t[-e char] [-l user] [-n tracefile] ",
diff --git a/usr.bin/usbhidctl/usbhid.c b/usr.bin/usbhidctl/usbhid.c
index 0584a7660f412..14855864f4b48 100644
--- a/usr.bin/usbhidctl/usbhid.c
+++ b/usr.bin/usbhidctl/usbhid.c
@@ -93,7 +93,7 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "Usage: %s -f device [-l] [-n] [-r] [-t tablefile] [-v] name ...\n", __progname);
+	fprintf(stderr, "usage: %s -f device [-l] [-n] [-r] [-t tablefile] [-v] name ...\n", __progname);
 	fprintf(stderr, "       %s -f device [-l] [-n] [-r] [-t tablefile] [-v] -a\n", __progname);
 	exit(1);
 }
diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c
index edcc0ab0b2ea9..80d548264c9b4 100644
--- a/usr.bin/xlint/lint1/main1.c
+++ b/usr.bin/xlint/lint1/main1.c
@@ -208,7 +208,7 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "Usage: lint1 [-abcdeghmprstuvwyzF] [-X <id>[,<id>]... src dest\n");
+	    "usage: lint1 [-abcdeghmprstuvwyzF] [-X <id>[,<id>]... src dest\n");
 	exit(1);
 }
 
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index 27fdff3be38e0..80e5cf708fd5d 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -283,7 +283,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-	    "Usage: lint [-abceghprvwxzHF] [-s|-t] [-i|-nu] [-Dname[=def]]"
+	    "usage: lint [-abceghprvwxzHF] [-s|-t] [-i|-nu] [-Dname[=def]]"
 	    " [-Uname] [-X <id>[,<id>]...\n");
 	(void)fprintf(stderr,
 	    "\t[-Idirectory] [-Ldirectory] [-llibrary] [-ooutputfile]"
diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c
index 051d53413e1a4..31e7d51b01d1f 100644
--- a/usr.sbin/burncd/burncd.c
+++ b/usr.sbin/burncd/burncd.c
@@ -562,7 +562,7 @@ void
 usage(void)
 {
 	fprintf(stderr,
-	    "Usage: %s [-delmnpqtv] [-f device] [-s speed] [command]"
+	    "usage: %s [-delmnpqtv] [-f device] [-s speed] [command]"
 	    " [command file ...]\n", getprogname());
 	exit(EX_USAGE);
 }
diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c
index 6b3bd92059a60..1538567e23622 100644
--- a/usr.sbin/crunch/crunchide/crunchide.c
+++ b/usr.sbin/crunch/crunchide/crunchide.c
@@ -130,7 +130,7 @@ char **argv;
 void usage(void)
 {
     fprintf(stderr,
-	    "Usage: %s [-k <symbol-name>] [-f <keep-list-file>] <files> ...\n",
+	    "usage: %s [-k <symbol-name>] [-f <keep-list-file>] <files> ...\n",
 	    pname);
     exit(1);
 }
diff --git a/usr.sbin/ctm/ctm_rmail/options.h b/usr.sbin/ctm/ctm_rmail/options.h
index 5c8dd94789fe8..86c1247b6487d 100644
--- a/usr.sbin/ctm/ctm_rmail/options.h
+++ b/usr.sbin/ctm/ctm_rmail/options.h
@@ -62,7 +62,7 @@ pusage()
     /*
      * Avoid gratuitously loading stdio.
      */
-    write(STDERR_FILENO, "Usage: ", 7);
+    write(STDERR_FILENO, "usage: ", 7);
     write(STDERR_FILENO, O_name, strlen(O_name));
     write(STDERR_FILENO, " ", 1);
     write(STDERR_FILENO, O_usage, strlen(O_usage));
diff --git a/usr.sbin/digictl/digictl.c b/usr.sbin/digictl/digictl.c
index dbcdb93aa2427..0aa5f68f2578c 100644
--- a/usr.sbin/digictl/digictl.c
+++ b/usr.sbin/digictl/digictl.c
@@ -41,7 +41,7 @@ enum aflag { NO_AFLAG, ALTPIN_DISABLE, ALTPIN_ENABLE, ALTPIN_QUERY };
 static int
 usage(const char *prog)
 {
-	fprintf(stderr, "Usage: %s -a disable|enable|query device\n", prog);
+	fprintf(stderr, "usage: %s -a disable|enable|query device\n", prog);
 	fprintf(stderr, "       %s [-d debug] [-ir] ctrl-device...\n", prog);
 	return (EX_USAGE);
 }
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index bdfd19cfcdd5b..dded501658d58 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -30,7 +30,7 @@ main(int argc, char **argv)
 	struct in_addr in;
 
 	if (argc < 5) 
-		errx(1, "Usage: %s path hostname ip-number command ...\n",
+		errx(1, "usage: %s path hostname ip-number command ...\n",
 		    argv[0]);
 	i = chdir(argv[1]);
 	if (i)
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index 7be0c22f2a8d2..e631ecc3d85f4 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -340,7 +340,7 @@ usage(void)
 {
 
 	fprintf(stderr, "%s\n",
-	    "Usage: kldxref [-Rdv] [-f hintfile] path [path..]"
+	    "usage: kldxref [-Rdv] [-f hintfile] path [path..]"
 	);
 	exit(1);
 }
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 1e6f4002fe446..bc470466e801d 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -106,7 +106,7 @@ generic(void (*specificrtn)(struct printer *_pp),
 	char **targv;
 
 	if (argc == 1) {
-		printf("Usage: %s {all | printer ...}\n", argv[0]);
+		printf("usage: %s {all | printer ...}\n", argv[0]);
 		return;
 	}
 
@@ -796,7 +796,7 @@ down(int argc, char *argv[])
 	struct printer myprinter, *pp = &myprinter;
 
 	if (argc == 1) {
-		printf("Usage: down {all | printer} [message ...]\n");
+		printf("usage: down {all | printer} [message ...]\n");
 		return;
 	}
 	if (!strcmp(argv[1], "all")) {
@@ -1080,7 +1080,7 @@ topq(int argc, char *argv[])
 	struct printer myprinter, *pp = &myprinter;
 
 	if (argc < 3) {
-		printf("Usage: topq printer [jobnum ...] [user ...]\n");
+		printf("usage: topq printer [jobnum ...] [user ...]\n");
 		return;
 	}
 
diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c
index 8ff070baaa87d..109ac17429015 100644
--- a/usr.sbin/ngctl/main.c
+++ b/usr.sbin/ngctl/main.c
@@ -406,7 +406,7 @@ HelpCmd(int ac, char **av)
 	default:
 		/* Show help on a specific command */
 		if ((cmd = FindCommand(av[1])) != NULL) {
-			printf("Usage:    %s\n", cmd->cmd);
+			printf("usage:    %s\n", cmd->cmd);
 			if (cmd->aliases[0] != NULL) {
 				int a = 0;
 
diff --git a/usr.sbin/pccard/pccardc/beep.c b/usr.sbin/pccard/pccardc/beep.c
index dda2e1c428079..be62c56238a7b 100644
--- a/usr.sbin/pccard/pccardc/beep.c
+++ b/usr.sbin/pccard/pccardc/beep.c
@@ -64,7 +64,7 @@ beep_main(argc, argv)
 		}
 	}
 	if (!valid)
-		errx(1, "Usage: %s beep newstat", argv[0]);
+		errx(1, "usage: %s beep newstat", argv[0]);
 
 	sscanf(argv[1], "%d", &newstat);
 	sprintf(name, CARD_DEVICE, 0);
diff --git a/usr.sbin/pccard/pccardc/power.c b/usr.sbin/pccard/pccardc/power.c
index 45a82f5b50222..59d43a57436ad 100644
--- a/usr.sbin/pccard/pccardc/power.c
+++ b/usr.sbin/pccard/pccardc/power.c
@@ -68,7 +68,7 @@ power_main(argc, argv)
 		}
 	}
 	if (!valid)
-		errx(1, "Usage: %s power slot newstat", argv[0]);
+		errx(1, "usage: %s power slot newstat", argv[0]);
 
 	sscanf(argv[2], "%d", &newstat);
 	sprintf(name, CARD_DEVICE, atoi(argv[1]));
diff --git a/usr.sbin/pcvt/userkeys/vt220keys.c b/usr.sbin/pcvt/userkeys/vt220keys.c
index 9d84473907362..e3fe90cac9fb8 100644
--- a/usr.sbin/pcvt/userkeys/vt220keys.c
+++ b/usr.sbin/pcvt/userkeys/vt220keys.c
@@ -182,7 +182,7 @@ usage()
 {
         int i;
 
-        fprintf(stderr,"Usage: %s [-cil] [keyname string keyname string...]\n\n",prog);
+        fprintf(stderr,"usage: %s [-cil] [keyname string keyname string...]\n\n",prog);
         fprintf(stderr,"The following options are available\n");
         fprintf(stderr,"\t-c\tclears keys first\n");
         fprintf(stderr,"\t-l\t[sets then] locks further setting\n");
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 80e9fefaf1dbc..54a725a88b736 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -1092,7 +1092,7 @@ FindExec(struct bundle *bundle, struct cmdtab const *cmds, int argc, int argn,
               mkPrefix(argn+1, argv, prefix, sizeof prefix));
 
   if (val == -1)
-    log_Printf(LogWARN, "Usage: %s\n", cmd->syntax);
+    log_Printf(LogWARN, "usage: %s\n", cmd->syntax);
   else if (val)
     log_Printf(LogWARN, "%s: Failed %d\n",
               mkPrefix(argn+1, argv, prefix, sizeof prefix), val);
@@ -2606,7 +2606,7 @@ LinkCommand(struct cmdargs const *arg)
     return result;
   }
 
-  log_Printf(LogWARN, "Usage: %s\n", arg->cmd->syntax);
+  log_Printf(LogWARN, "usage: %s\n", arg->cmd->syntax);
   return 2;
 }
 
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 6cf390caf5ee2..1fb6737f59835 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -186,7 +186,7 @@ RestartServer(int signo)
 static void
 Usage(void)
 {
-  fprintf(stderr, "Usage: ppp [-auto | -foreground | -background | -direct |"
+  fprintf(stderr, "usage: ppp [-auto | -foreground | -background | -direct |"
           " -dedicated | -ddial | -interactive]"
 #ifndef NOALIAS
           " [-nat]"
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index f477d6d1b4b0a..6bdb3cf74700e 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -215,7 +215,7 @@ nat_RedirectAddr(struct cmdargs const *arg)
     error = StrToAddr(arg->argv[arg->argn+1], &aliasaddr);
     if (error) {
       prompt_Printf(arg->prompt, "address redirect: invalid alias address\n");
-      prompt_Printf(arg->prompt, "Usage: nat %s %s\n", arg->cmd->name,
+      prompt_Printf(arg->prompt, "usage: nat %s %s\n", arg->cmd->name,
                     arg->cmd->syntax);
       return 1;
     }
@@ -223,7 +223,7 @@ nat_RedirectAddr(struct cmdargs const *arg)
     if (link == NULL) {
       prompt_Printf(arg->prompt, "address redirect: packet aliasing"
                     " engine error\n");
-      prompt_Printf(arg->prompt, "Usage: nat %s %s\n", arg->cmd->name,
+      prompt_Printf(arg->prompt, "usage: nat %s %s\n", arg->cmd->name,
                     arg->cmd->syntax);
     }
   } else
@@ -269,7 +269,7 @@ nat_RedirectProto(struct cmdargs const *arg)
       error = StrToAddr(arg->argv[arg->argn + 2], &publicIP);
       if (error) {
         prompt_Printf(arg->prompt, "proto redirect: invalid alias address\n");
-        prompt_Printf(arg->prompt, "Usage: nat %s %s\n", arg->cmd->name,
+        prompt_Printf(arg->prompt, "usage: nat %s %s\n", arg->cmd->name,
                       arg->cmd->syntax);
         return 1;
       }
@@ -280,7 +280,7 @@ nat_RedirectProto(struct cmdargs const *arg)
       error = StrToAddr(arg->argv[arg->argn + 2], &remoteIP);
       if (error) {
         prompt_Printf(arg->prompt, "proto redirect: invalid dst address\n");
-        prompt_Printf(arg->prompt, "Usage: nat %s %s\n", arg->cmd->name,
+        prompt_Printf(arg->prompt, "usage: nat %s %s\n", arg->cmd->name,
                       arg->cmd->syntax);
         return 1;
       }
@@ -291,7 +291,7 @@ nat_RedirectProto(struct cmdargs const *arg)
     if (link == NULL) {
       prompt_Printf(arg->prompt, "proto redirect: packet aliasing"
                     " engine error\n");
-      prompt_Printf(arg->prompt, "Usage: nat %s %s\n", arg->cmd->name,
+      prompt_Printf(arg->prompt, "usage: nat %s %s\n", arg->cmd->name,
                     arg->cmd->syntax);
     }
   } else
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index 4bcb75117905a..68e888f6308bc 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -186,7 +186,7 @@ DecodeCtrlCommand(char *line, char *arg)
   if (!strncasecmp(line, "include", 7) && issep(line[7])) {
     end = InterpretArg(line+8, arg);
     if (*end && *end != '#')
-      log_Printf(LogWARN, "Usage: !include filename\n");
+      log_Printf(LogWARN, "usage: !include filename\n");
     else
       return CTRL_INCLUDE;
   }
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index 1c7c744f91197..d3b7b3d2ca160 100644
--- a/usr.sbin/pppstats/pppstats.c
+++ b/usr.sbin/pppstats/pppstats.c
@@ -88,7 +88,7 @@ int main __P((int, char *argv[]));
 static void
 usage()
 {
-    fprintf(stderr, "Usage: %s [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]\n",
+    fprintf(stderr, "usage: %s [-a|-d] [-v|-r|-z] [-c count] [-w wait] [interface]\n",
 	    progname);
     exit(1);
 }
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index bc8efe7568fae..90d65aaed65e1 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -181,7 +181,7 @@ main(argc, argv)
 static void
 usage()
 {
-	fprintf(stderr, "Usage: rip6query [-I iface] address\n");
+	fprintf(stderr, "usage: rip6query [-I iface] address\n");
 }
 
 /* getnameinfo() is preferred as we may be able to show ifindex as ifname */
diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c
index 1541d5f2e00f1..85230af50dc94 100644
--- a/usr.sbin/usbd/usbd.c
+++ b/usr.sbin/usbd/usbd.c
@@ -211,7 +211,7 @@ int  find_action	__P((struct usb_device_info *devinfo,
 void
 usage(void)
 {
-	fprintf(stderr, "Usage: %s [-d] [-v] [-t timeout] [-e] [-f dev]\n"
+	fprintf(stderr, "usage: %s [-d] [-v] [-t timeout] [-e] [-f dev]\n"
 			"           [-n] [-c config]\n",
 		__progname);
 	exit(1);
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 1d085b7e35481..71bf824d9bb51 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -64,7 +64,7 @@ int main(int, char **);
 void
 usage()
 {
-	fprintf(stderr, "Usage: %s [-a addr] [-d] [-f dev] [-v]\n",
+	fprintf(stderr, "usage: %s [-a addr] [-d] [-f dev] [-v]\n",
 	    getprogname());
 	exit(1);
 }
-- 
cgit v1.3


From 835f98334837674df4e27224f2a10444a7c817d6 Mon Sep 17 00:00:00 2001
From: Lukas Ertl <le@FreeBSD.org>
Date: Mon, 24 May 2004 12:38:54 +0000
Subject: Diff reduction to NetBSD.

MFNetBSD 1.21; author: itojun
   use bounded string op

MFNetBSD 1.22; author: grant
   s/netbsd.org/NetBSD.org/i

Obtained from:  NetBSD
---
 usr.sbin/usbdevs/usbdevs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 71bf824d9bb51..0cda38d94d3c4 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdevs.c,v 1.17 2001/02/19 23:22:48 cgd Exp $	*/
+/*	$NetBSD: usbdevs.c,v 1.22 2003/11/12 13:31:08 grant Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -6,7 +6,7 @@
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (augustss@netbsd.org).
+ * by Lennart Augustsson (augustss@NetBSD.org).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -201,7 +201,7 @@ main(int argc, char **argv)
 
 	if (dev == 0) {
 		for (ncont = 0, i = 0; i < 10; i++) {
-			sprintf(buf, "%s%d", USBDEV, i);
+			snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
 			f = open(buf, O_RDONLY);
 			if (f >= 0) {
 				dumpone(buf, f, addr);
-- 
cgit v1.3


From ede09ff6de3b86526d774c90cd2a578b768179a6 Mon Sep 17 00:00:00 2001
From: Lukas Ertl <le@FreeBSD.org>
Date: Mon, 24 May 2004 13:22:00 +0000
Subject: Add option '-o' for one-line output in combination with '-d'.

PR:             bin/62911 (patch slightly adopted)
Submitted by:   Corris Randall <corris@line6.net>
---
 usr.sbin/usbdevs/usbdevs.8 |  6 +++++-
 usr.sbin/usbdevs/usbdevs.c | 25 +++++++++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'usr.sbin/usbdevs/usbdevs.c')

diff --git a/usr.sbin/usbdevs/usbdevs.8 b/usr.sbin/usbdevs/usbdevs.8
index fb2f87af103e3..3226dd5bd6589 100644
--- a/usr.sbin/usbdevs/usbdevs.8
+++ b/usr.sbin/usbdevs/usbdevs.8
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 15, 2000
+.Dd May 24, 2004
 .Dt USBDEVS 8
 .Os
 .Sh NAME
@@ -45,6 +45,7 @@
 .Op Fl a Ar addr
 .Op Fl d
 .Op Fl f Ar dev
+.Op Fl o
 .Op Fl v
 .Sh DESCRIPTION
 The
@@ -61,6 +62,9 @@ only print information about the device at the given address.
 Show the device drivers associated with each device.
 .It Fl f Ar dev
 only print information for the given USB controller.
+.It Fl o
+One-line output (only useful in combination with
+.Fl d ) .
 .It Fl v
 Be verbose.
 .El
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 0cda38d94d3c4..640dd512f7f29 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -54,6 +54,7 @@
 
 int verbose = 0;
 int showdevs = 0;
+int oneline = 0;
 
 void usage(void);
 void usbdev(int f, int a, int rec);
@@ -109,13 +110,22 @@ usbdev(int f, int a, int rec)
 		       di.udi_vendor, di.udi_vendorNo, di.udi_release);
 	} else
 		printf("%s, %s", di.udi_product, di.udi_vendor);
-	printf("\n");
+	if (!oneline)
+		printf("\n");
 	if (showdevs) {
-		for (i = 0; i < USB_MAX_DEVNAMES; i++)
-			if (di.udi_devnames[i][0])
-				printf("%*s  %s\n", indent, "",
-				       di.udi_devnames[i]);
+		for (i = 0; i < USB_MAX_DEVNAMES; i++) {
+			if (di.udi_devnames[i][0]) {
+				if (oneline)
+					printf(", device %s",
+					    di.udi_devnames[i]);
+				else
+					printf("%*s  %s\n", indent, "",
+					    di.udi_devnames[i]);
+			}
+		}
 	}
+	if (oneline)
+		printf("\n");
 	if (!rec)
 		return;
 	for (p = 0; p < di.udi_nports; p++) {
@@ -177,7 +187,7 @@ main(int argc, char **argv)
 	int addr = 0;
 	int ncont;
 
-	while ((ch = getopt(argc, argv, "a:df:v?")) != -1) {
+	while ((ch = getopt(argc, argv, "a:df:ov?")) != -1) {
 		switch(ch) {
 		case 'a':
 			addr = atoi(optarg);
@@ -188,6 +198,9 @@ main(int argc, char **argv)
 		case 'f':
 			dev = optarg;
 			break;
+		case 'o':
+			oneline++;
+			break;
 		case 'v':
 			verbose = 1;
 			break;
-- 
cgit v1.3