diff options
| author | Kenny Levinsen <kl@kl.wtf> | 2020-08-01 03:23:56 +0200 |
|---|---|---|
| committer | Kenny Levinsen <kl@kl.wtf> | 2020-08-01 16:53:44 +0200 |
| commit | e129536a08a74045719640676b55a03b926117d9 (patch) | |
| tree | 790d460b307479842d16ecb0ab89fbc7eb3a0752 /include | |
| parent | dc9c7bff71cb843c6ba7b68e977d130ae8098201 (diff) | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/compiler.h | 2 | ||||
| -rw-r--r-- | include/drm.h | 7 | ||||
| -rw-r--r-- | include/evdev.h | 7 | ||||
| -rw-r--r-- | include/seat.h | 8 |
4 files changed, 19 insertions, 5 deletions
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 <sys/types.h> - int drm_set_master(int fd); int drm_drop_master(int fd); +int path_is_drm(const char *path); + +#if defined(__linux__) +#include <sys/types.h> 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 <sys/types.h> - int evdev_revoke(int fd); +int path_is_evdev(const char *path); + +#if defined(__linux__) +#include <sys/types.h> 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 { |