2 files changed, 45 insertions, 9 deletions

diff --git a/uisimulator/x11/dir.h b/uisimulator/x11/dir.h
index b1df855311..a3898076f6 100644
--- a/uisimulator/x11/dir.h
+++ b/uisimulator/x11/dir.h
@@ -20,6 +20,7 @@
 #define dirent x11_dirent
 #define readdir(x) x11_readdir(x)
 #define opendir(x) x11_opendir(x)
+#define closedir(x) x11_closedir(x)
 
 /*
  * The defines above should let us use the readdir() and opendir() in target
@@ -38,6 +39,17 @@
 
 #include "../../firmware/common/dir.h"
 
-extern DIR *x11_opendir(char *name);
-extern struct dirent* x11_readdir(DIR* dir);
+#define SIMULATOR_ARCHOS_ROOT "archos"
 
+struct mydir {
+  DIR *dir;
+  char *name;
+};
+
+typedef struct mydir MYDIR;
+
+extern MYDIR *x11_opendir(char *name);
+extern struct dirent* x11_readdir(MYDIR* dir);
+extern void x11_closedir(MYDIR *dir);
+
+#define DIR MYDIR
diff --git a/uisimulator/x11/io.c b/uisimulator/x11/io.c
index 0452d65ae8..726bfa26a2 100644
--- a/uisimulator/x11/io.c
+++ b/uisimulator/x11/io.c
@@ -1,31 +1,55 @@
 
+#include <sys/stat.h>
 #include "dir.h"
 
-#define SIMULATOR_ARCHOS_ROOT "archos"
+#undef DIR
 
-DIR *x11_opendir(char *name)
+MYDIR *x11_opendir(char *name)
 {
   char buffer[256]; /* sufficiently big */
+  MYDIR *my = (MYDIR *)malloc(sizeof(MYDIR));
 
   if(name[0] == '/') {
     sprintf(buffer, "%s%s", SIMULATOR_ARCHOS_ROOT, name);    
-    return opendir(buffer);
+    my->dir=(DIR *)opendir(buffer);
   }
-  return opendir(name);
+  else
+    my->dir=(DIR *)opendir(name);
+  
+  my->name = (char *)strdup(name);
+
+  return my;
 }
 
-struct dirent *x11_readdir(DIR *dir)
+struct dirent *x11_readdir(MYDIR *dir)
 {
+  char buffer[512]; /* sufficiently big */
   static struct dirent secret;
+  struct stat s;
 
-  struct x11_dirent *x11 = (readdir)(dir);
+  struct x11_dirent *x11 = (readdir)(dir->dir);
 
   strcpy(secret.d_name, x11->d_name);
-  secret.attribute = (x11->d_type == DT_DIR)?ATTR_DIRECTORY:0;
+
+  /* build file name */
+  sprintf(buffer, SIMULATOR_ARCHOS_ROOT "%s/%s",
+          dir->name, x11->d_name);
+  stat(buffer, &s); /* get info */
+
+  secret.attribute = S_ISDIR(s.st_mode)?ATTR_DIRECTORY:0;
+  secret.size = s.st_size;
 
   return &secret;
 }
 
+void x11_closedir(MYDIR *dir)
+{
+  free(dir->name);
+  (closedir)(dir->dir);
+
+  free(dir);
+}
+
 
 int x11_open(char *name, int opts)
 {