improved info status items for the playlist selector

[paraslash.git] / fd.c

diff --git a/fd.c b/fd.c
index 4928850e38d7d01688702d8acb8e898da53e284d..ef2c64caced7aaef2751d6fa0233e0b33346dfae 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -20,6 +20,7 @@
 
 #include "para.h"
 
+#include <fcntl.h>
 #include <sys/select.h>
 
 #include "error.h"
@@ -93,9 +94,34 @@ 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.
+ *
+ * \sa para_select
 */
 void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 {
        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;
 }