nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i3bar: Do not kill watcher on EOF 

Wait for the child process to exit on its own before freeing
watcher-related resources.

i3bar shows the last received status line until the process exits.

Fixes a race condition where the termination signal was sometimes not
received to display a meaningful error message.
This commit is contained in:
Tony Crisci 2014-02-13 20:17:18 -05:00 committed by Michael Stapelberg
parent 759c26fc02
commit 00909aa3b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3bar/src/child.c
View File

@ -266,6 +266,8 @@ static int stdin_end_array(void *context) {
/* /*
* Helper function to read stdin * Helper function to read stdin
* *
* Returns NULL on EOF.
*
*/ */
static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) { static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
int fd = watcher->fd; int fd = watcher->fd;
@ -285,9 +287,7 @@ static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (n == 0) { if (n == 0) {
/* end of file, kill the watcher */
ELOG("stdin: received EOF\n"); ELOG("stdin: received EOF\n");
cleanup();
*ret_buffer_len = -1; *ret_buffer_len = -1;
return NULL; return NULL;
} }