Skip to content

don't call signal unsafe functions in sighandler #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
N-R-K wants to merge 1 commit into
base: master
Choose a base branch
from
Open

don't call signal unsafe functions in sighandler #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions herbe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <stdarg.h>
#include <fcntl.h>
#include <semaphore.h>
#include <poll.h>

#include "config.h"

Expand All @@ -18,6 +19,7 @@
Display *display;
Window window;
int exit_code = EXIT_DISMISS;
static volatile sig_atomic_t sig_recieved;

static void die(const char *format, ...)
{
Expand Down Expand Up @@ -72,11 +74,7 @@ int get_max_len(char *string, XftFont *font, int max_text_width)

void expire(int sig)
{
XEvent event;
event.type = ButtonPress;
event.xbutton.button = (sig == SIGUSR2) ? (ACTION_BUTTON) : (DISMISS_BUTTON);
XSendEvent(display, window, 0, 0, &event);
XFlush(display);
sig_recieved = sig_recieved ? sig_recieved : sig;
}

int main(int argc, char *argv[])
Expand Down Expand Up @@ -183,7 +181,21 @@ int main(int argc, char *argv[])
for (;;)
{
XEvent event;
XNextEvent(display, &event);
struct pollfd pfd = {
.fd = ConnectionNumber(display),
.events = POLLIN,
};
int pending = XPending(display) > 0 || poll(&pfd, 1, -1) > 0;

if (sig_recieved)
{
exit_code = sig_recieved == SIGUSR2 ? EXIT_ACTION : EXIT_DISMISS;
break;
}
else if (pending)
XNextEvent(display, &event);
else
continue;

if (event.type == Expose)
{
Expand Down Expand Up @@ -217,4 +229,4 @@ int main(int argc, char *argv[])
XCloseDisplay(display);

return exit_code;
}
}