Module Name: src
Committed By: jakllsch
Date: Sat Jan 2 01:04:15 UTC 2016
Modified Files:
src/lib/libusbhid: usage.c
src/tests/lib/libusbhid: t_usbhid.c
Log Message:
Fix round-trip of hid_usage_in_page(hid_parse_usage_in_page()) when
the usage is a catch-all format string.
This should allow usbhidctl(1) to understand an item argument of
"Button:Button_65535".
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libusbhid/usage.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libusbhid/t_usbhid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libusbhid/usage.c
diff -u src/lib/libusbhid/usage.c:1.7 src/lib/libusbhid/usage.c:1.8
--- src/lib/libusbhid/usage.c:1.7 Sun Apr 9 00:49:55 2006
+++ src/lib/libusbhid/usage.c Sat Jan 2 01:04:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usage.c,v 1.7 2006/04/09 00:49:55 christos Exp $ */
+/* $NetBSD: usage.c,v 1.8 2016/01/02 01:04:15 jakllsch Exp $ */
/*
* Copyright (c) 1999 Lennart Augustsson <augus...@netbsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: usage.c,v 1.7 2006/04/09 00:49:55 christos Exp $");
+__RCSID("$NetBSD: usage.c,v 1.8 2016/01/02 01:04:15 jakllsch Exp $");
#include <assert.h>
#include <ctype.h>
@@ -235,7 +235,12 @@ hid_parse_usage_in_page(const char *name
found:
sep++;
for (j = 0; j < pages[k].pagesize; j++)
- if (strcmp(pages[k].page_contents[j].name, sep) == 0)
+ if (pages[k].page_contents[j].usage == -1) {
+ if (sscanf(sep, fmtcheck(
+ pages[k].page_contents[j].name, "%u"), &l) == 1) {
+ return (pages[k].usage << 16) | l;
+ }
+ } else if (strcmp(pages[k].page_contents[j].name, sep) == 0)
return (pages[k].usage << 16) | pages[k].page_contents[j].usage;
return (-1);
}
Index: src/tests/lib/libusbhid/t_usbhid.c
diff -u src/tests/lib/libusbhid/t_usbhid.c:1.4 src/tests/lib/libusbhid/t_usbhid.c:1.5
--- src/tests/lib/libusbhid/t_usbhid.c:1.4 Fri Jan 1 23:46:04 2016
+++ src/tests/lib/libusbhid/t_usbhid.c Sat Jan 2 01:04:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_usbhid.c,v 1.4 2016/01/01 23:46:04 jakllsch Exp $ */
+/* $NetBSD: t_usbhid.c,v 1.5 2016/01/02 01:04:15 jakllsch Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_usbhid.c,v 1.4 2016/01/01 23:46:04 jakllsch Exp $");
+__RCSID("$NetBSD: t_usbhid.c,v 1.5 2016/01/02 01:04:15 jakllsch Exp $");
#include <atf-c.h>
@@ -167,9 +167,6 @@ ATF_TC_BODY(check_hid_usage, tc)
(void)strlcat(usages_path, "/test_usb_hid_usages",
sizeof(usages_path));
- atf_tc_expect_fail("hid_parse_*() fails because it doesn't use "
- "scanf()");
-
hid_init(usages_path);
ATF_CHECK_STREQ("t_usbhid_page", hid_usage_page(0xff1b));
