Changeset 3e828ea in mainline for uspace/lib/posix/src

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

uspace/lib/posix/src

Files:

• internal/common.h (modified) (1 diff)
• sys/mman.c (modified) (2 diffs)

uspace/lib/posix/src/internal/common.h

@@ -67 +67 @@
 }
 
+// TODO: Remove this arbitrary limit.
+#define VFS_MAX_OPEN_FILES 128
+
 extern aoff64_t posix_pos[VFS_MAX_OPEN_FILES];
 

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);
 }