Merge /home/maan/scm/paraslash_fml/paraslash into mmap

[paraslash.git] / fd.c

diff --git a/fd.c b/fd.c
index df7921b4f393c4b4c2bcfc963c757c0a67aec661..30623d1b321b8dfed84b07c33034fc20e05dd351 100644 (file)
--- 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>
 
@@ -167,8 +167,42 @@ again:
        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 : ret;
+       return ret < 0? -E_FSEEK : 1;
+}
+
+/**
+ * *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);
 }
+