X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fplat.c;h=2842691e5e22d2e65be373eb10a26b27942ea8ea;hb=39b2c61e1d4ef370b0f84cb5a601f9f2d3a1d35a;hp=ec381fad01a2352c082c2a755a6cbc137b2402f1;hpb=62e581e179cc311c345ae95a351551fca40b0619;p=libpicofe.git

diff --git a/linux/plat.c b/linux/plat.c
index ec381fa..2842691 100644
--- a/linux/plat.c
+++ b/linux/plat.c
@@ -78,17 +78,19 @@ int plat_get_skin_dir(char *dst, int len)
 #endif
 int plat_get_root_dir(char *dst, int len)
 {
-#if defined(__GP2X__) || defined(PANDORA)
-	return plat_get_data_dir(dst, len);
-#else
-	char *home = getenv("HOME");
-	size_t nb = strlen(home);
+#if !defined(__GP2X__) && !defined(PANDORA)
+	const char *home = getenv("HOME");
+	int ret;
 
-	memcpy(dst, home, nb);
-	memcpy(dst + nb, PICO_HOME_DIR, sizeof PICO_HOME_DIR);
-	mkdir(dst, 0755);
-	return nb + sizeof(PICO_HOME_DIR) - 1;
+	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__
@@ -176,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;
 
@@ -195,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;
 }
@@ -207,8 +216,18 @@ void *plat_mremap(void *ptr, size_t oldsize, size_t newsize)
 	void *ret;
 
 	ret = mremap(ptr, oldsize, newsize, MREMAP_MAYMOVE);
-	if (ret == MAP_FAILED)
-		return NULL;
+	if (ret == MAP_FAILED) {
+		fprintf(stderr, "mremap %p %zd %zd: ",
+			ptr, oldsize, newsize);
+		perror(NULL);
+		// might be because huge pages can't be remapped,
+		// just make a new mapping
+		ret = plat_mmap(0, newsize, 0, 0);
+		if (ret == MAP_FAILED)
+			return NULL;
+		memcpy(ret, ptr, oldsize);
+		munmap(ptr, oldsize);
+	}
 	if (ret != ptr)
 		printf("warning: mremap moved: %p -> %p\n", ptr, ret);