Changeset 52acfab in mainline for uspace/lib/posix/src/sys/mman.c

Timestamp:

2019-05-28T19:24:14Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

77de449e

Parents:

af5037d (diff), bebd154 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-28 19:24:14)

git-committer:

GitHub <noreply@…> (2019-05-28 19:24:14)

Message:

Merge pull request #161 from le-jzr/cxxcompat2

C++ compatibility improvements

File:

• uspace/lib/posix/src/sys/mman.c (modified) (2 diffs)

uspace/lib/posix/src/sys/mman.c

@@ -39 +39 @@
 #include <unistd.h>
 
+static int _prot_to_as(int prot)
+{
+        int ret = 0;
+
+        if (prot & PROT_READ)
+                ret |= AS_AREA_READ;
+
+        if (prot & PROT_WRITE)
+                ret |= AS_AREA_WRITE;
+
+        if (prot & PROT_EXEC)
+                ret |= AS_AREA_EXEC;
+
+        return ret;
+}
+
 void *mmap(void *start, size_t length, int prot, int flags, int fd,
     off_t offset)
@@ -53 +69 @@
                 return MAP_FAILED;
 
-        return as_area_create(start, length, prot, AS_AREA_UNPAGED);
+        return as_area_create(start, length, _prot_to_as(prot), AS_AREA_UNPAGED);
 }