koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipc: Correctly deal with SIGPIPE/failing write()s

Browse Source 
If a client disconnects while i3 still wants to write the reply, this
could lead to exits of i3 before.
This commit is contained in:
Michael Stapelberg 2010-03-12 15:02:00 +01:00
parent 0f5256dc72
commit 5a3d1b38e8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ipc.c
View File

@ -85,8 +85,10 @@ static void ipc_send_message(int fd, const unsigned char *payload,
int bytes_to_go = buffer_size; int bytes_to_go = buffer_size;
while (sent_bytes < bytes_to_go) { while (sent_bytes < bytes_to_go) {
int n = write(fd, msg + sent_bytes, bytes_to_go); int n = write(fd, msg + sent_bytes, bytes_to_go);
if (n == -1) if (n == -1) {
err(EXIT_FAILURE, "write() failed"); DLOG("write() failed: %s\n", strerror(errno));
return;
}
sent_bytes += n; sent_bytes += n;
bytes_to_go -= n; bytes_to_go -= n;

5
src/mainx.c
View File

@ -527,6 +527,11 @@ int main(int argc, char *argv[], char *env[]) {
xcb_check_cb(NULL, NULL, 0); xcb_check_cb(NULL, NULL, 0);
setup_signal_handler(); setup_signal_handler();
/* Ignore SIGPIPE to survive errors when an IPC client disconnects
* while we are sending him a message */
signal(SIGPIPE, SIG_IGN);
/* Ungrab the server to receive events and enter libev’s eventloop */ /* Ungrab the server to receive events and enter libev’s eventloop */
xcb_ungrab_server(conn); xcb_ungrab_server(conn);