fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-01-09 07:30:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/record: use safe_basename() to get to the hid report descriptor

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-02-18 14:06:03 +10:00
parent 671eb8cbbb
commit ca9067992e
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/libinput-record.c
View file

@ -1724,7 +1724,6 @@ print_hid_report_descriptor(struct record_context *ctx,
struct record_device *dev)
{
const char *prefix = "/dev/input/event";
const char *node;
char syspath[PATH_MAX];
unsigned char buf[1024];
int len;
@ -1733,18 +1732,16 @@ print_hid_report_descriptor(struct record_context *ctx,
/* we take the shortcut rather than the proper udev approach, the
report_descriptor is available in sysfs and two devices up from
our device. 2 digits for the event number should be enough.
our device.
This approach won't work for /dev/input/by-id devices. */
if (!strstartswith(dev->devnode, prefix) ||
strlen(dev->devnode) > strlen(prefix) + 2)
if (!strstartswith(dev->devnode, prefix))
return;
node = &dev->devnode[strlen(prefix)];
len = snprintf(syspath,
sizeof(syspath),
"/sys/class/input/event%s/device/device/report_descriptor",
node);
if (len < 55 || len > 56)
"/sys/class/input/%s/device/device/report_descriptor",
safe_basename(dev->devnode));
if (len <= 0)
return;
fd = open(syspath, O_RDONLY);