Mirroring/ltunify
1
0
Fork 0
mirror of https://github.com/Lekensteyn/ltunify.git synced 2025-12-09 02:03:22 +00:00
Code Issues Projects Releases Wiki Activity

ltunify: make driver name matching more obvious

Browse Source 
Use basename instead of memcmp with some calculations. Move the hiddraw device
matching outside a block in preparation for adding multiple match conditions.
This commit is contained in:
Peter Wu
2013-05-22 11:47:51 +02:00
parent 878ed69e40
commit 446ac25139
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ltunify.c
View File

@@ -30,6 +30,7 @@
#include <glob.h> /* for /dev/hidrawX discovery */
#include <getopt.h> /* for getopt_long */
#include <poll.h>
#include <libgen.h> /* for basename, used during discovery */
#ifndef PACKAGE_VERSION
# define PACKAGE_VERSION "0.1"
@@ -1098,23 +1099,32 @@ int open_hidraw(void) {
for (i = 0; i < matches.gl_pathc; i++) {
ssize_t r;
char *name = matches.gl_pathv[i];
const char *last_comp;
r = readlink(name, buf, sizeof buf);
r = readlink(name, buf, (sizeof buf) - 1);
if (r < 0) {
perror(name);
} else if ((size_t) r >= sizeof RECEIVER_NAME &&
!memcmp(buf + r - sizeof RECEIVER_NAME + 1, RECEIVER_NAME, sizeof RECEIVER_NAME - 1)) {
continue;
}
hiddev_name = name + sizeof "/sys/class/hidraw" - sizeof "/dev";
memcpy(hiddev_name, "/dev", sizeof "/dev" - 1);
name[strlen(name) - sizeof "/device/driver" + 1] = '\0';
buf[r] = 0; /* readlink does not NUL-terminate */
last_comp = basename(buf);
fd = open(hiddev_name, O_RDWR);
if (fd < 0) {
perror(hiddev_name);
} else {
break;
}
if (!strcmp(last_comp, RECEIVER_NAME)) {
/* Logitech receiver c52b and c532 - pass */
} else { /* unknown driver */
continue;
}
hiddev_name = name + sizeof "/sys/class/hidraw" - sizeof "/dev";
memcpy(hiddev_name, "/dev", sizeof "/dev" - 1);
name[strlen(name) - sizeof "/device/driver" + 1] = '\0';
fd = open(hiddev_name, O_RDWR);
if (fd < 0) {
perror(hiddev_name);
} else {
break;
}
}
}