X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Fdl.c;h=4282764202e6ae8656f201b8b170ab043c05e71a;hp=154e01236bd173bfa7e1549e908f377f2a152bc4;hb=ad37f577261dad19e7b0c7aedf68a800f13ed515;hpb=7fd42181a7f66b4403076cd9de98e18140a7eaf8

diff --git a/loader/dl.c b/loader/dl.c
index 154e012..4282764 100644
--- a/loader/dl.c
+++ b/loader/dl.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,6 +14,14 @@
 #define DL
 #include "override.c"
 
+static void next_line(FILE *f)
+{
+  int c;
+  do {
+    c = fgetc(f);
+  } while (c != EOF && c != '\n');
+}
+
 __attribute__((constructor))
 static void ginge_init(void)
 {
@@ -32,7 +45,7 @@ static void ginge_init(void)
     exit(1);
   }
 
-  ret = fscanf(f, "%x-%x %*s %*s %*s %*s %*s\n", &start, &end);
+  ret = fscanf(f, "%x-%x ", &start, &end);
   if (ret != 2) {
     perror("parse maps");
     exit(1);
@@ -46,6 +59,8 @@ static void ginge_init(void)
     perror("warning: mprotect");
 
   while (1) {
+    next_line(f);
+
     ret = fscanf(f, "%x-%*s %*s %*s %*s %*s %*s\n", &start);
     if (ret <= 0)
       break;
@@ -62,6 +77,12 @@ static void ginge_init(void)
 #endif
   fclose(f);
 
+  // remove self from preload, further commands (from system() and such)
+  // will be handled by ginge_prep.
+  unsetenv("LD_PRELOAD");
+  unsetenv("LD_LIBRARY_PATH");
+
   emu_init((void *)lowest_segment);
 }
 
+// vim:shiftwidth=2:expandtab