From 55d220b4005644b4008beced8c14cea8ad5382f5 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Wed, 11 May 2011 03:40:03 -0300
Subject: [PATCH] tools/lib/usbopen.c: make vendor and/or product optional

- usbopen.c (open_usb): determine vendor and product objective outside
  the loop
- usbopen.c (open_usb): check vendor and product only if non-zero
- usbopen.c (bad_id, parse_usb_id): vendor and product can now be
  omitted
---
 tools/lib/usbopen.c | 46 +++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/tools/lib/usbopen.c b/tools/lib/usbopen.c
index b807db2..8e26229 100644
--- a/tools/lib/usbopen.c
+++ b/tools/lib/usbopen.c
@@ -62,15 +62,18 @@ usb_dev_handle *open_usb(uint16_t default_vendor, uint16_t default_product)
 
 	initialize();
 
+	if (!vendor)
+		vendor = default_vendor;
+	if (!product)
+		product = default_product;
+
 	for (bus = usb_get_busses(); bus; bus = bus->next)
 		for (dev = bus->devices; dev; dev = dev->next) {
 			if (restricted_path && restricted_path != dev)
 				continue;
-			if (dev->descriptor.idVendor !=
-			    (vendor ? vendor : default_vendor))
+			if (vendor && dev->descriptor.idVendor != vendor)
 				continue;
-			if (dev->descriptor.idProduct !=
-			    (product ? product : default_product))
+			if (product && dev->descriptor.idProduct != product)
 				continue;
 			handle = usb_open(dev);
 #ifdef DO_FULL_USB_BUREAUCRACY
@@ -103,7 +106,7 @@ usb_dev_handle *open_usb(uint16_t default_vendor, uint16_t default_product)
 
 static void bad_id(const char *id)
 {
-	fprintf(stderr, "\"%s\" is not a valid vendor:product ID\n", id);
+	fprintf(stderr, "\"%s\" is not a valid [vendor]:[product] ID\n", id);
 	exit(1);
 }
 
@@ -113,18 +116,29 @@ void parse_usb_id(const char *id)
 	unsigned long tmp;
 	char *end;
 
-	tmp = strtoul(id, &end, 16);
-	if (*end != ':')
+	if (*id == ':') {
+		vendor = 0;
+		end = (char *) id; /* ugly */
+	} else {
+		tmp = strtoul(id, &end, 16);
+		if (*end != ':')
+			bad_id(id);
+		if (tmp > 0xffff)
+			bad_id(id);
+		vendor = tmp;
+	}
+	if (!*end)
 		bad_id(id);
-	if (tmp > 0xffff)
-		bad_id(id);
-	vendor = tmp;
-	tmp = strtoul(end+1, &end, 16);
-	if (*end)
-		bad_id(id);
-	if (tmp > 0xffff)
-		bad_id(id);
-	product = tmp;
+	if (!end[1])
+		product = 0;
+	else {
+		tmp = strtoul(end+1, &end, 16);
+		if (*end)
+			bad_id(id);
+		if (tmp > 0xffff)
+			bad_id(id);
+		product = tmp;
+	}
 }