plat: avoid MAP_FIXED

[libpicofe.git] / linux / plat.c

diff --git a/linux/plat.c b/linux/plat.c
index 04ebd12..06c315e 100644 (file)
--- a/linux/plat.c
+++ b/linux/plat.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 #include "../plat.h"
 
@@ -40,24 +41,56 @@ int plat_is_dir(const char *path)
        return 0;
 }
 
-int plat_get_root_dir(char *dst, int len)
+static int plat_get_data_dir(char *dst, int len)
 {
-       int j, ret;
-
-       ret = readlink("/proc/self/exe", dst, len - 1);
+#ifdef PICO_DATA_DIR
+       memcpy(dst, PICO_DATA_DIR, sizeof PICO_DATA_DIR);
+       return sizeof(PICO_DATA_DIR) - 1;
+#else
+       int j, ret = readlink("/proc/self/exe", dst, len - 1);
        if (ret < 0) {
                perror("readlink");
                ret = 0;
        }
        dst[ret] = 0;
 
-       for (j = strlen(dst); j > 0; j--)
+       for (j = ret - 1; j > 0; j--)
                if (dst[j] == '/') {
                        dst[++j] = 0;
                        break;
                }
-
        return j;
+#endif
+}
+
+int plat_get_skin_dir(char *dst, int len)
+{
+       int ret = plat_get_data_dir(dst, len);
+       if (ret < 0)
+               return ret;
+
+       memcpy(dst + ret, "skin/", sizeof "skin/");
+       return ret + sizeof("skin/") - 1;
+}
+
+#ifndef PICO_HOME_DIR
+#define PICO_HOME_DIR "/.picodrive/"
+#endif
+int plat_get_root_dir(char *dst, int len)
+{
+#if !defined(__GP2X__) && !defined(PANDORA)
+       const char *home = getenv("HOME");
+       int ret;
+
+       if (home != NULL) {
+               ret = snprintf(dst, len, "%s%s", home, PICO_HOME_DIR);
+               if (ret >= len)
+                       ret = len - 1;
+               mkdir(dst, 0755);
+               return ret;
+       }
+#endif
+       return plat_get_data_dir(dst, len);
 }
 
 #ifdef __GP2X__
@@ -145,8 +178,10 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
        req = (void *)addr;
        if (need_exec)
                prot |= PROT_EXEC;
+       /* avoid MAP_FIXED, it overrides existing mappings..
        if (is_fixed)
                flags |= MAP_FIXED;
+       */
        if (size >= HUGETLB_THRESHOLD)
                flags |= MAP_HUGETLB;
 
@@ -164,9 +199,14 @@ void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
        if (ret == MAP_FAILED)
                return NULL;
 
-       if (req != NULL && ret != req)
-               fprintf(stderr,
-                       "warning: mmaped to %p, requested %p\n", ret, req);
+       if (req != NULL && ret != req) {
+               fprintf(stderr, "%s: mmaped to %p, requested %p\n",
+                       is_fixed ? "error" : "warning", ret, req);
+               if (is_fixed) {
+                       munmap(ret, size);
+                       return NULL;
+               }
+       }
 
        return ret;
 }
@@ -200,6 +240,16 @@ void plat_munmap(void *ptr, size_t size)
        }
 }
 
+int plat_mem_set_exec(void *ptr, size_t size)
+{
+       int ret = mprotect(ptr, size, PROT_READ | PROT_WRITE | PROT_EXEC);
+       if (ret != 0)
+               fprintf(stderr, "mprotect(%p, %zd) failed: %d\n",
+                       ptr, size, errno);
+
+       return ret;
+}
+
 /* lprintf */
 void lprintf(const char *fmt, ...)
 {