Automated merge with file:///home/lupine/Development/bigv-repos/flexnbd-c-sockutil

2013-02-15 16:53:18 +00:00
parent 9826dc6c65 98d8fbeaf0
commit 6842864e74
23 changed files with 1401 additions and 90 deletions
--- a/src/serve.c
+++ b/src/serve.c
@@ -636,8 +636,10 @@ int server_accept( struct server * params )
 	self_pipe_fd_set( params->close_signal, &fds );
 	self_pipe_fd_set( params->acl_updated_signal, &fds );

-	FATAL_IF_NEGATIVE(select(FD_SETSIZE, &fds,
-				NULL, NULL, NULL), "select() failed");
+	FATAL_IF_NEGATIVE(
+		sock_try_select(FD_SETSIZE, &fds, NULL, NULL, NULL),
+		SHOW_ERRNO( "select() failed" )
+	);

 	if ( self_pipe_fd_isset( params->close_signal, &fds ) ){
 		server_close_clients( params );