X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=36b3769d289a03aa0148aa941a713ba1534a2be0;hp=ef2c64caced7aaef2751d6fa0233e0b33346dfae;hb=8a8cd0f5bb40dcfad68608193e8c57decd90b25e;hpb=6acf01b71c38441686d6167617feee86a2960d62 diff --git a/fd.c b/fd.c index ef2c64ca..36b3769d 100644 --- a/fd.c +++ b/fd.c @@ -56,15 +56,16 @@ int file_exists(const char *fn) * \sa select(2) select_tut(2) */ int para_select(int n, fd_set *readfds, fd_set *writefds, - struct timeval *timeout) + struct timeval *timeout_tv) { int ret, err; do { - ret = select(n, readfds, writefds, NULL, timeout); + ret = select(n, readfds, writefds, NULL, timeout_tv); err = errno; } while (ret < 0 && err == EINTR); if (ret < 0) - PARA_CRIT_LOG("select error (%s)\n", strerror(err)); + PARA_CRIT_LOG("select error: %s, max_fileno: %d\n", + strerror(err), n); return ret; } @@ -99,6 +100,20 @@ int mark_fd_nonblock(int fd) */ void para_fd_set(int fd, fd_set *fds, int *max_fileno) { + + if (fd < 0 || fd >= FD_SETSIZE) { + PARA_EMERG_LOG("fatal: tried to add invalid fd %d\n", fd); + exit(EXIT_FAILURE); + } +#if 0 + { + int flags = fcntl(fd, F_GETFL); + if (!(flags & O_NONBLOCK)) { + PARA_EMERG_LOG("fd %d is a blocking file descriptor\n", fd); + exit(EXIT_FAILURE); + } + } +#endif FD_SET(fd, fds); *max_fileno = PARA_MAX(*max_fileno, fd); }