X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=f0e849d1a71509d7a22a994ea77292c929bfd44f;hp=637884b4b895a9279c5c928ea4028dbddb1a74c7;hb=72cc3679948fe7c1f1b74f809a4dd2b949dc1bde;hpb=77aa550660c490ef33bc42f7185516708908d022

diff --git a/fd.c b/fd.c
index 637884b4..f0e849d1 100644
--- a/fd.c
+++ b/fd.c
@@ -1,25 +1,13 @@
 /*
  * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file fd.c helper functions for file descriptor handling */
 
 #include "para.h"
-
+#include <sys/mman.h>
 #include <fcntl.h>
 #include <sys/select.h>
 
@@ -63,9 +51,11 @@ int para_select(int n, fd_set *readfds, fd_set *writefds,
 		ret = select(n, readfds, writefds, NULL, timeout_tv);
 		err = errno;
 	} while (ret < 0 && err == EINTR);
-	if (ret < 0)
+	if (ret < 0) {
 		PARA_CRIT_LOG("select error: %s, max_fileno: %d\n",
 			strerror(err), n);
+		ret = -E_SELECT;
+	}
 	return ret;
 }
 
@@ -118,28 +108,6 @@ void para_fd_set(int fd, fd_set *fds, int *max_fileno)
 	*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;
-}
 /**
 * paraslash's wrapper for fgets(3)
 * \param line pointer to the buffer to store the line
@@ -168,18 +136,26 @@ 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
+ * *paraslash's wrapper for mmap
  *
- * \return positive on success, -E_FSEEK on errors.
+ * \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
  *
- * \sa fseek(3)
+ * \return This function either returns a valid pointer to the mapped area
+ * or calls exit() on errors.
  */
-int para_fseek(FILE *stream, long offset, int whence)
+void *para_mmap(size_t length, int prot, int flags, int fd, off_t offset)
 {
-	int ret = fseek(stream, offset, whence);
-	return ret < 0? -E_FSEEK : 1;
+	void *ret = mmap(NULL, length, prot, flags, fd, offset);
+	if (ret != MAP_FAILED)
+		return ret;
+	PARA_EMERG_LOG("mmap failed: %s\n", strerror(errno));
+	PARA_EMERG_LOG("length: %zu, flags: %d, fd: %d, offset: %zu\n",
+		length, flags, fd, (size_t)offset);
+	exit(EXIT_FAILURE);
 }
+