From e129536a08a74045719640676b55a03b926117d9 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Sat, 1 Aug 2020 03:23:56 +0200 Subject: devices: Use path to check device type FreeBSD device numbers cannot be used to check the type of a device, as they are merely unique filesystem IDs. As the paths we use have been sanitized with realpath, we can simply use the path to check if a requested file is an evdev or drm device. This also allows us to make the check before the file is opened. --- include/compiler.h | 2 ++ include/drm.h | 7 +++++-- include/evdev.h | 7 +++++-- include/seat.h | 8 +++++++- 4 files changed, 19 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/compiler.h b/include/compiler.h index d0f6ed2..11f3495 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -15,4 +15,6 @@ #define ALWAYS_INLINE inline #endif +#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1) + #endif diff --git a/include/drm.h b/include/drm.h index 1012c89..8a7fb10 100644 --- a/include/drm.h +++ b/include/drm.h @@ -1,10 +1,13 @@ #ifndef _SEATD_DRM_H #define _SEATD_DRM_H -#include - int drm_set_master(int fd); int drm_drop_master(int fd); +int path_is_drm(const char *path); + +#if defined(__linux__) +#include int dev_is_drm(dev_t device); +#endif #endif diff --git a/include/evdev.h b/include/evdev.h index 0f20e3e..6ebd943 100644 --- a/include/evdev.h +++ b/include/evdev.h @@ -1,9 +1,12 @@ #ifndef _SEATD_EVDEV_H #define _SEATD_EVDEV_H -#include - int evdev_revoke(int fd); +int path_is_evdev(const char *path); + +#if defined(__linux__) +#include int dev_is_evdev(dev_t device); +#endif #endif diff --git a/include/seat.h b/include/seat.h index e52a961..e0d3533 100644 --- a/include/seat.h +++ b/include/seat.h @@ -8,13 +8,19 @@ struct client; +enum seat_device_type { + SEAT_DEVICE_TYPE_NORMAL, + SEAT_DEVICE_TYPE_EVDEV, + SEAT_DEVICE_TYPE_DRM, +}; + struct seat_device { int device_id; int fd; int ref_cnt; bool active; char *path; - dev_t dev; + enum seat_device_type type; }; struct seat { -- cgit v1.2.3