mrtoth/kde-lockscreen-suspend-display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix forgotten errno return in evdev C code

Browse Source
This commit is contained in:
Kristóf Tóth 2021-10-15 20:55:41 +02:00
parent 98ed8d9a29
commit 771ddc8ce3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xdg/keypressdetector/evdev.c
View File

@ -1,10 +1,11 @@
#include <errno.h>
#include "evdev.h" #include "evdev.h"
int block_until_keypress(const char* keyboardPath) { int block_until_keypress(const char* keyboardPath) {
int keyboardFd = open(keyboardPath, O_RDONLY); int keyboardFd = open(keyboardPath, O_RDONLY);
if (keyboardFd < 0) { if (keyboardFd < 0) {
return keyboardFd; return errno;
} }
int eventSize = sizeof(struct input_event); int eventSize = sizeof(struct input_event);
@ -15,7 +16,7 @@ int block_until_keypress(const char* keyboardPath) {
while(readEvents) { while(readEvents) {
bytesRead = read(keyboardFd, events, eventSize * NUM_EVENTS); bytesRead = read(keyboardFd, events, eventSize * NUM_EVENTS);
if (bytesRead < 0) { if (bytesRead < 0) {
return bytesRead; return errno;
} }
for(int i = 0; i < (bytesRead / eventSize); ++i) { for(int i = 0; i < (bytesRead / eventSize); ++i) {

2
xdg/keypressdetector/evdev.go
View File

@ -20,7 +20,7 @@ func (Evdev) BlockUntilKeypress(devicePath string) error {
defer C.free(unsafe.Pointer(path)) defer C.free(unsafe.Pointer(path))
ret := C.block_until_keypress(path) ret := C.block_until_keypress(path)
if ret < 0 { if ret != 0 {
return syscall.Errno(ret) return syscall.Errno(ret)
} }