overview.sk: update to 0.2.13

[paraslash.git] / fd.c

diff --git a/fd.c b/fd.c
index dc22d147711cbf2d152d895293bf79a4190352b5..b913009369ba6029fcdf4fa8378c9d926e30dd10 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -64,7 +64,8 @@ int para_select(int n, fd_set *readfds, fd_set *writefds,
                err = errno;
        } while (ret < 0 && err == EINTR);
        if (ret < 0)
                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;
 }
 
        return ret;
 }
 


@@ -94,9 +95,48 @@ int mark_fd_nonblock(int fd)
  *
  * This wrapper for FD_SET() passes its first two arguments to \p FD_SET. Upon
  * return, \a max_fileno contains the maximum of the old_value and \a fd.
  *
  * This wrapper for FD_SET() passes its first two arguments to \p FD_SET. Upon
  * return, \a max_fileno contains the maximum of the old_value and \a fd.

+ *
+ * \sa para_select

 */
 void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 {
 */
 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);
        FD_SET(fd, fds);

-       *max_fileno = MAX(*max_fileno, fd);
+       *max_fileno = PARA_MAX(*max_fileno, fd);
+}
+
+/**
+ * paraslash's wrapper for fread(3)
+ *
+ * \param dest destination pointer
+ * \param nbytes size of one element
+ * \param nmemb number of elements to write
+ * \param stream the input stream
+ *
+ * \return negative on errors, zero on end of file, and the number of bytes
+ * (not elements) read on success.
+ *
+ * \sa fread(3)
+ */
+__must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, FILE *stream)
+{
+       size_t res = fread(dest, nbytes, nmemb, stream);
+       if (res == nmemb)
+               return nbytes * nmemb;
+       if (feof(stream))
+               return 0;
+       return -E_FREAD;

 }
 }