From 8d395740534a6a10aca946e0a179127b8c944718 Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Thu, 23 Sep 2004 16:32:08 +0000
Subject: Fix problems with select zeroing out timeouts.

---
 common/spio.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'common/spio.c')

diff --git a/common/spio.c b/common/spio.c
index 91e2da0..67d32b1 100644
--- a/common/spio.c
+++ b/common/spio.c
@@ -169,6 +169,7 @@ unsigned int spio_select(spctx_t* ctx, ...)
     int have = 0;
     int i = 0;
     va_list ap;
+    struct timeval timeout;
 
     ASSERT(ctx);
     FD_ZERO(&mask);
@@ -207,9 +208,11 @@ unsigned int spio_select(spctx_t* ctx, ...)
 
     for(;;)
     {
+        /* Select can modify the timeout argument so we copy */
+        memcpy(&timeout, &(g_state.timeout), sizeof(timeout));
+
         /* Otherwise wait on more data */
-        switch(select(FD_SETSIZE, &mask, NULL, NULL,
-               (struct timeval*)&(g_state.timeout)))
+        switch(select(FD_SETSIZE, &mask, NULL, NULL, &timeout))
         {
         case 0:
             sp_messagex(ctx, LOG_ERR, "network operation timed out");
-- 
cgit v1.2.3