Assume F_GETFL is available

bwitt · Oct 9, 2015 · e52b1a3 · e52b1a3
1 parent 93b9833
commit e52b1a3
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/code/protocol.rb b/code/protocol.rb
@@ -14,20 +14,13 @@ def set_protocol_messages(messages)
     end
 
     def set_nonblocking(sock)
-      flag = File::NONBLOCK
-      if defined?(Fcntl::F_GETFL)
-        flag |= sock.fcntl(Fcntl::F_GETFL)
-      end
-      sock.fcntl(Fcntl::F_SETFL, flag)
+      flags = sock.fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK
+      sock.fcntl(Fcntl::F_SETFL, flags)
     end
 
     def reset_nonblocking(sock)
-      # Linux Doesn't inherit and BSD does... recomended behavior is to set again
-      flag = 0xffffffff ^ File::NONBLOCK
-      if defined?(Fcntl::F_GETFL)
-        flag &= sock.fcntl(Fcntl::F_GETFL)
-      end
-      sock.fcntl(Fcntl::F_SETFL, flag)
+      flags = sock.fcntl(Fcntl::F_GETFL) ^ Fcntl::O_NONBLOCK
+      sock.fcntl(Fcntl::F_SETFL, flags)
     end
 
     def read_packet(sock)