1 files changed, 19 insertions, 5 deletions

diff --git a/uisimulator/x11/io.c b/uisimulator/x11/io.c
index 726bfa26a2..53cee8d086 100644
--- a/uisimulator/x11/io.c
+++ b/uisimulator/x11/io.c
@@ -1,8 +1,20 @@
 
 #include <sys/stat.h>
-#include "dir.h"
+#include <dirent.h>
 
-#undef DIR
+#define DIRFUNCTIONS_DEFINED /* prevent those prototypes */
+#define dirent x11_dirent
+#include "../../firmware/common/dir.h"
+#undef dirent
+
+#define SIMULATOR_ARCHOS_ROOT "archos"
+
+struct mydir {
+  DIR *dir;
+  char *name;
+};
+
+typedef struct mydir MYDIR;
 
 MYDIR *x11_opendir(char *name)
 {
@@ -21,13 +33,15 @@ MYDIR *x11_opendir(char *name)
   return my;
 }
 
-struct dirent *x11_readdir(MYDIR *dir)
+struct x11_dirent *x11_readdir(MYDIR *dir)
 {
   char buffer[512]; /* sufficiently big */
-  static struct dirent secret;
+  static struct x11_dirent secret;
   struct stat s;
+  struct dirent *x11 = (readdir)(dir->dir);
 
-  struct x11_dirent *x11 = (readdir)(dir->dir);
+  if(!x11)
+    return NULL;
 
   strcpy(secret.d_name, x11->d_name);