diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2011-01-08 01:52:36 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2011-01-08 01:52:36 +0000 |
commit | 69cb1f830e4fd2282ddcbc7ee2bbe30069b9e4cd (patch) | |
tree | 49efff28238bbba524974db0512859a310d0b09c /client.c | |
parent | 703160b5d6b64e45a684894260693c60b5524d51 (diff) |
Move all calls to fcntl(...O_NONBLOCK) into a function and clear the
flag on the stdio file descriptors before closing them (fixes things
like "tmux ls && cat").
Diffstat (limited to 'client.c')
-rw-r--r-- | client.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -54,7 +54,7 @@ client_connect(char *path, int start_server) { struct sockaddr_un sa; size_t size; - int fd, mode; + int fd; memset(&sa, 0, sizeof sa); sa.sun_family = AF_UNIX; @@ -84,10 +84,7 @@ client_connect(char *path, int start_server) } } - if ((mode = fcntl(fd, F_GETFL)) == -1) - fatal("fcntl failed"); - if (fcntl(fd, F_SETFL, mode|O_NONBLOCK) == -1) - fatal("fcntl failed"); + setblocking(fd, 0); return (fd); failed: |