commit 11431f3299d4624ae4539e934cb745be06557703
parent 8b7eab545c1528a556ae9891b913076ce6c6a16c
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Wed, 30 Mar 2016 19:33:48 -0600
viewer: tidy up osx nonblock code
Diffstat:
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/viewer/af_unix.cc b/viewer/af_unix.cc
@@ -22,15 +22,14 @@ void
af_unix::set_listen()
{
#if defined(__APPLE__)
- // OS X socket() doesn't take SOCK_NONBLOCK
+ // OS X socket() doesn't take SOCK_NONBLOCK so roll it by hand
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
err(1, "socket");
int flags = fcntl(fd, F_GETFL, 0);
if (flags < 0)
err(1, "fcntl(F_GETFL)");
- fcntl(fd, F_SETFL, flags | O_NONBLOCK);
- if (flags < 0)
+ if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0)
err(1, "fcntl(F_SETFL)");
#else
if ((fd = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0)) == -1)