- correct treatment of timeout=NULL

This commit is contained in:
zolliker
2008-11-10 16:19:22 +00:00
parent 90852c2637
commit 9374bea841

View File

@ -1,5 +1,6 @@
#include <signal.h>
#include <errno.h>
#include <stddef.h>
#include "uselect.h"
/* an uninterruptable version of select. M.Z. Oct 2008 */
@ -9,10 +10,15 @@ int uselect(int nfds,
struct timeval *timeout) {
sigset_t sigmask;
struct timespec tmo;
sigfillset(&sigmask);
tmo.tv_sec = timeout->tv_sec;
tmo.tv_nsec = timeout->tv_usec * 1000;
return pselect(nfds, readfds, writefds, exceptfds, &tmo, &sigmask);
struct timespec tmo, *tmoPtr;
sigfillset(&sigmask);
if (timeout) {
tmo.tv_sec = timeout->tv_sec;
tmo.tv_nsec = timeout->tv_usec * 1000;
tmoPtr = &tmo;
} else {
tmoPtr = NULL;
}
return pselect(nfds, readfds, writefds, exceptfds, tmoPtr, &sigmask);
}