Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2025-02-16 20:48:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Work around Big Sur read buffer tracking

Browse source 
As noted by @koekeishiya on yabai#714, it seems a bug was introduced
in Big Sur which causes `read` calls to track buffers incorrectly.
These changes (taken from koekeishiya/yabai@4f8be49) work around this.

Closes #41
This commit is contained in:
Calum MacRae 2021-03-27 13:24:09 +00:00
parent 0520f18156
commit 9f8087d920
No known key found for this signature in database
GPG key ID: 53922D7E54A14F5D
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
makefile
View file

@ -4,10 +4,10 @@ BUILD_FLAGS = -std=c99 -Wall -DDEBUG -g -O0 -fvisibility=hidden -mmacosx-vers
BUILD_PATH = ./bin
DOC_PATH = ./doc
SMP_PATH = ./examples
SPACEBAR_SRC = ./src/manifest.m
SPACEBAR_SRC = ./src/manifest.m
BINS = $(BUILD_PATH)/spacebar
.PHONY: all clean install sign archive man
.PHONY: all clean install archive man
all: clean $(BINS)

13
src/misc/socket.c
View file

@ -14,6 +14,19 @@ char *socket_read(int sockfd, int *len)
result = temp;
memcpy(result+cursor, buffer, bytes_read);
cursor += bytes_read;
if (((result+cursor)[-1] == '\0') &&
((result+cursor)[-2] == '\0')) {
// NOTE(cmacrae): if our message ends with double null-terminator we
// have successfully received the entire message. this was added because
// on macOS Big Sur we would in a few rare cases read the message AND YET
// still enter another call to *read* above that would block, because the
// client was finished sending its message and is blocking in a poll loop
// waiting for a response.
break;
}
}
if (result && bytes_read != -1) {

3
src/spacebar.c
View file

@ -54,7 +54,7 @@ static int client_send_message(int argc, char **argv)
error("spacebar-msg: failed to connect to socket..\n");
}
int message_length = argc - 1;
int message_length = argc;
int argl[argc];
for (int i = 1; i < argc; ++i) {
@ -70,6 +70,7 @@ static int client_send_message(int argc, char **argv)
temp += argl[i];
*temp++ = '\0';
}
*temp++ = '\0';
if (!socket_write_bytes(sockfd, message, message_length)) {
error("spacebar-msg: failed to send data..\n");