Osx fixes.

[m6w6/libmemcached] / libtest / cmdline.cc

diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index 1a13342b6b4a9e38b811d8d0afd77152b4fe806e..b93d8aba096b10fa5cf0a81307877f18e159ea6c 100644 (file)
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -300,7 +300,7 @@ bool Application::slurp()
     return false;
   }
 
-  if (fds[0].revents == POLLIN)
+  if (fds[0].revents & POLLIN)
   {
     ssize_t read_length;
     char buffer[1024]= { 0 };
@@ -329,8 +329,10 @@ bool Application::slurp()
     }
   }
 
-  if (fds[1].revents == POLLIN)
+  if (fds[1].revents & POLLIN)
   {
+    stderr_fd.nonblock();
+
     ssize_t read_length;
     char buffer[1024]= { 0 };
     while ((read_length= ::read(stderr_fd.fd()[0], buffer, sizeof(buffer))))