summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2010-09-19 09:54:48 +0200
committerHenrik Rydberg <rydberg@euromail.se>2010-09-19 09:54:48 +0200
commit643ebb8d70a99fbb17e9c9b9b89122b039ef5bd0 (patch)
treebb21c02f550c06ca8f4cd80614e6a619c040f517
parent576078ffa78a62a2c807f5a3b471aed815d3ace4 (diff)
Do not allow spaces in device name
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--data/3m.prop2
-rw-r--r--src/evemu.c3
2 files changed, 4 insertions, 1 deletions
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)