On Thu, Apr 14, 2022 at 04:44:10PM +0200, Marc Espie wrote:
> I'm not quite fond of the error reports, though... they could be more specific
> - we keep track of the first error, so it should probably talk
> about /dev/wskbd0 directly ?
I wanted to show that more than one device is envolved.
But actually the error is always from /dev/wskbd0.
> - by comparison, the message for the WSKBDIO_GTYPE doesn't mention the
> device name. I think err(1, "WKBDIO_GTYPE on %s", device) might be slightly
> more helpful.
# kbd -l
kbd: WSKBDIO_GTYPE /dev/wskbd0: Bad address
> I don't see the need for the word "open "in the message.
$ ./kbd -l
kbd: /dev/wskbd0: Permission denied
ok?
Index: sbin/kbd/kbd_wscons.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sbin/kbd/kbd_wscons.c,v
retrieving revision 1.34
diff -u -p -r1.34 kbd_wscons.c
--- sbin/kbd/kbd_wscons.c 22 Jan 2020 06:24:07 -0000 1.34
+++ sbin/kbd/kbd_wscons.c 14 Apr 2022 15:59:26 -0000
@@ -150,7 +150,7 @@ kbd_list(void)
{
int kbds[SA_MAX];
struct wskbd_encoding_data encs[SA_MAX];
- int fd, i, kbtype, t;
+ int fd, i, kbtype, t, error = 0;
char device[PATH_MAX];
memset(kbds, 0, sizeof(kbds));
@@ -162,9 +162,16 @@ kbd_list(void)
fd = open(device, O_WRONLY);
if (fd == -1)
fd = open(device, O_RDONLY);
- if (fd >= 0) {
+ if (fd == -1) {
+ /* remember the first error number */
+ if (error == 0)
+ error = errno;
+ } else {
+ /* at least one success, do not print error */
+ error = -1;
+
if (ioctl(fd, WSKBDIO_GTYPE, &kbtype) == -1)
- err(1, "WSKBDIO_GTYPE");
+ err(1, "WSKBDIO_GTYPE %s", device);
switch (kbtype) {
case WSKBD_TYPE_PC_XT:
case WSKBD_TYPE_PC_AT:
@@ -207,6 +214,10 @@ kbd_list(void)
}
close(fd);
}
+ }
+ if (error > 0) {
+ errno = error;
+ err(1, "/dev/wskbd0");
}
for (i = 0; i < SA_MAX; i++)
