X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=1116f9e880b8013207fdd58e8d7a06808e0e48db;hp=d53a3b4521fdbec1e16aa3263ba07f699feac40c;hb=e402aa45bbac0b078fefc88ed6dd108cbae6e743;hpb=bba06e19f5b28bcc459e7579e7ac711739873c07;ds=sidebyside

diff --git a/fd.c b/fd.c
index d53a3b45..1116f9e8 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
@@ -19,7 +19,7 @@
 /** \file fd.c helper functions for file descriptor handling */
 
 #include "para.h"
-
+#include <sys/mman.h>
 #include <fcntl.h>
 #include <sys/select.h>
 
@@ -119,29 +119,7 @@ void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 }
 
 /**
- * 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;
-}
-/**
-* paraslash's wrapper for fgets(3)  
+* 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
@@ -166,3 +144,26 @@ again:
 	clearerr(f);
 	goto again;
 }
+
+/**
+ * *paraslash's wrapper for mmap
+ *
+ * \param length number of bytes to mmap
+ * \param prot either PROT_NONE or the bitwise OR of one or more of
+ * PROT_EXEC PROT_READ PROT_WRITE
+ * \param flags exactly one of MAP_SHARED and MAP_PRIVATE
+ * \param fd the file to mmap from
+ * \param offset mmap start
+ *
+ * \return This function either returns a valid pointer to the mapped area
+ * or calls exit() on errors.
+ */
+void *para_mmap(size_t length, int prot, int flags, int fd, off_t offset)
+{
+	void *ret = mmap(NULL, length, prot, flags, fd, offset);
+	if (ret != MAP_FAILED)
+		return ret;
+	PARA_EMERG_LOG("mmap failed: %s", strerror(errno));
+	exit(EXIT_FAILURE);
+}
+