Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-08 00:34:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 3687575e8c into 3eaf1255b2

Browse Source
This commit is contained in:
Mike Skec 2023-07-22 16:25:45 +08:00 committed by GitHub
commit 54e82e38b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/linux_joystick.c
View File

@ -277,12 +277,11 @@ void _glfwDetectJoystickConnectionLinux(void)
while (size > offset) while (size > offset)
{ {
regmatch_t match;
const struct inotify_event* e = (struct inotify_event*) (buffer + offset); const struct inotify_event* e = (struct inotify_event*) (buffer + offset);
offset += sizeof(struct inotify_event) + e->len; offset += sizeof(struct inotify_event) + e->len;
if (regexec(&_glfw.linjs.regex, e->name, 1, &match, 0) != 0) if (regexec(&_glfw.linjs.regex, e->name, 0, NULL, 0) != 0)
continue; continue;
char path[PATH_MAX]; char path[PATH_MAX];
@ -326,7 +325,7 @@ GLFWbool _glfwInitJoysticksLinux(void)
// Continue without device connection notifications if inotify fails // Continue without device connection notifications if inotify fails
if (regcomp(&_glfw.linjs.regex, "^event[0-9]\\+$", 0) != 0) if (regcomp(&_glfw.linjs.regex, "^event[0-9]\\+$", REG_NOSUB) != 0)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex"); _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex");
return GLFW_FALSE; return GLFW_FALSE;
@ -341,9 +340,7 @@ GLFWbool _glfwInitJoysticksLinux(void)
while ((entry = readdir(dir))) while ((entry = readdir(dir)))
{ {
regmatch_t match; if (regexec(&_glfw.linjs.regex, entry->d_name, 0, NULL, 0) != 0)
if (regexec(&_glfw.linjs.regex, entry->d_name, 1, &match, 0) != 0)
continue; continue;
char path[PATH_MAX]; char path[PATH_MAX];