Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for WSMUX_BELL, also avoid crashes when the kernel returns 

unknown device types.
This commit is contained in:
mlelstv 2019-03-29 07:47:33 +00:00
parent f3a852ff14
commit 5e6e55c4f6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/wsmuxctl/wsmuxctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsmuxctl.c,v 1.12 2019/02/03 03:19:31 mrg Exp $ */ /* $NetBSD: wsmuxctl.c,v 1.13 2019/03/29 07:47:33 mlelstv Exp $ */
/* /*
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -45,8 +45,6 @@ __dead static void usage(void);
static const char *ctlpath = "/dev/wsmuxctl"; static const char *ctlpath = "/dev/wsmuxctl";
static const char *devnames[] = { "?", "wsmouse", "wskbd", "wsmux" };
static void static void
usage(void) usage(void)
{ {
@ -71,6 +69,10 @@ parsedev(const char *dev, struct wsmux_device *mdev)
mdev->type = WSMUX_MUX; mdev->type = WSMUX_MUX;
return; return;
} }
if (sscanf(dev, "wsbell%d", &mdev->idx) == 1) {
mdev->type = WSMUX_BELL;
return;
}
errx(1, "bad device: `%s', use wsmouse, wskdb, or wsmux", dev); errx(1, "bad device: `%s', use wsmouse, wskdb, or wsmux", dev);
} }
@ -80,12 +82,19 @@ listdevs(int fd, int rec, int ind)
int i, rfd; int i, rfd;
char buf[100]; char buf[100];
struct wsmux_device_list devs; struct wsmux_device_list devs;
const char *name;
if (ioctl(fd, WSMUXIO_LIST_DEVICES, &devs) < 0) if (ioctl(fd, WSMUXIO_LIST_DEVICES, &devs) < 0)
err(1, "WSMUXIO_LIST_DEVICES"); err(1, "WSMUXIO_LIST_DEVICES");
for (i = 0; i < devs.ndevices; i++) { for (i = 0; i < devs.ndevices; i++) {
printf("%*s%s%d\n", ind, "", devnames[devs.devices[i].type], switch (devs.devices[i].type) {
devs.devices[i].idx); case WSMUX_MOUSE: name = "wsmouse"; break;
case WSMUX_KBD: name = "wskbd"; break;
case WSMUX_MUX: name = "wsmux"; break;
case WSMUX_BELL: name = "wsbell"; break;
default: name = "?"; break;
}
printf("%*s%s%d\n", ind, "", name, devs.devices[i].idx);
if (rec && devs.devices[i].type == WSMUX_MUX) { if (rec && devs.devices[i].type == WSMUX_MUX) {
snprintf(buf, sizeof(buf), "%s%d", ctlpath, snprintf(buf, sizeof(buf), "%s%d", ctlpath,
devs.devices[i].idx); devs.devices[i].idx);