From 643ebb8d70a99fbb17e9c9b9b89122b039ef5bd0 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Sun, 19 Sep 2010 09:54:48 +0200 Subject: Do not allow spaces in device name Signed-off-by: Henrik Rydberg --- data/3m.prop | 2 +- src/evemu.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/3m.prop b/data/3m.prop index b1aac4d..67fbef3 100644 --- a/data/3m.prop +++ b/data/3m.prop @@ -1,4 +1,4 @@ -N: 3M 3M MicroTouch USB controller +N: 3M-3M-MicroTouch-USB-controller I: 0003 0596 0502 0110 B: 00 0b 00 00 00 00 00 00 00 B: 01 00 00 00 00 00 00 00 00 diff --git a/src/evemu.c b/src/evemu.c index 6c99a89..54156aa 100644 --- a/src/evemu.c +++ b/src/evemu.c @@ -54,6 +54,9 @@ int evemu_extract(struct evemu_device *dev, int fd) SYSCALL(rc = ioctl(fd, EVIOCGNAME(sizeof(dev->name)), dev->name)); if (rc < 0) return rc; + for (i = 0; i < sizeof(dev->name); i++) + if (isspace(dev->name[i])) + dev->name[i] = '-'; SYSCALL(rc = ioctl(fd, EVIOCGID, &dev->id)); if (rc < 0) -- cgit v1.2.3