X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=637884b4b895a9279c5c928ea4028dbddb1a74c7;hp=b913009369ba6029fcdf4fa8378c9d926e30dd10;hb=dde66c2fd66ff7876176687e30563630f585ae5b;hpb=6969c9fa8293a44daf7ba5a0426573fcd71c1953

diff --git a/fd.c b/fd.c
index b9130093..637884b4 100644
--- a/fd.c
+++ b/fd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@ int file_exists(const char *fn)
  * \param n the highest-numbered descriptor in any of the two sets, plus 1
  * \param readfds fds that should be checked for readability
  * \param writefds fds that should be checked for writablility
- * \param timeout upper bound on the amount of time elapsed before select()
- *  returns
+ * \param timeout_tv upper bound on the amount of time elapsed before select()
+ * returns
  *
  * \return The return value of the underlying select() call.
  *
@@ -56,11 +56,11 @@ 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)
@@ -140,3 +140,46 @@ __must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, FILE *strea
 		return 0;
 	return -E_FREAD;
 }
+/**
+* paraslash's wrapper for fgets(3)
+* \param line pointer to the buffer to store the line
+* \param size the size of the buffer given by \a line
+* \param f the stream to read from
+*
+* \return Unlike the standard fgets() function, an integer value
+* is returned. On success, this function returns 1. On errors, -E_FGETS
+* is returned. A zero return value indicates an end of file condition.
+*/
+__must_check int para_fgets(char *line, int size, FILE *f)
+{
+again:
+	if (fgets(line, size, f))
+		return 1;
+	if (feof(f))
+		return 0;
+	if (!ferror(f))
+		return -E_FGETS;
+	if (errno != EINTR) {
+		PARA_ERROR_LOG("%s\n", strerror(errno));
+		return -E_FGETS;
+	}
+	clearerr(f);
+	goto again;
+}
+
+/**
+ * paralash's wrapper for fseek(3)
+ *
+ * \param stream stream to seek
+ * \param offset added to the position specified by whence
+ * \param whence \p SEEK_SET, \p SEEK_CUR, or \p SEEK_END
+ *
+ * \return positive on success, -E_FSEEK on errors.
+ *
+ * \sa fseek(3)
+ */
+int para_fseek(FILE *stream, long offset, int whence)
+{
+	int ret = fseek(stream, offset, whence);
+	return ret < 0? -E_FSEEK : 1;
+}