diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2010-09-19 09:54:48 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-09-19 09:54:48 +0200 |
| commit | 643ebb8d70a99fbb17e9c9b9b89122b039ef5bd0 (patch) | |
| tree | bb21c02f550c06ca8f4cd80614e6a619c040f517 | |
| parent | 576078ffa78a62a2c807f5a3b471aed815d3ace4 (diff) | |
Do not allow spaces in device name
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| -rw-r--r-- | data/3m.prop | 2 | ||||
| -rw-r--r-- | src/evemu.c | 3 |
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 @@ | |||
| 1 | N: 3M 3M MicroTouch USB controller | 1 | N: 3M-3M-MicroTouch-USB-controller |
| 2 | I: 0003 0596 0502 0110 | 2 | I: 0003 0596 0502 0110 |
| 3 | B: 00 0b 00 00 00 00 00 00 00 | 3 | B: 00 0b 00 00 00 00 00 00 00 |
| 4 | B: 01 00 00 00 00 00 00 00 00 | 4 | 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) | |||
| 54 | SYSCALL(rc = ioctl(fd, EVIOCGNAME(sizeof(dev->name)), dev->name)); | 54 | SYSCALL(rc = ioctl(fd, EVIOCGNAME(sizeof(dev->name)), dev->name)); |
| 55 | if (rc < 0) | 55 | if (rc < 0) |
| 56 | return rc; | 56 | return rc; |
| 57 | for (i = 0; i < sizeof(dev->name); i++) | ||
| 58 | if (isspace(dev->name[i])) | ||
| 59 | dev->name[i] = '-'; | ||
| 57 | 60 | ||
| 58 | SYSCALL(rc = ioctl(fd, EVIOCGID, &dev->id)); | 61 | SYSCALL(rc = ioctl(fd, EVIOCGID, &dev->id)); |
| 59 | if (rc < 0) | 62 | if (rc < 0) |
