From 109acd2fa3befdaf41f9fe73d820e53bd809d589 Mon Sep 17 00:00:00 2001
From: Syrus <me@syrusakbary.com>
Date: Wed, 12 Jun 2019 01:01:47 +0200
Subject: [PATCH] Trying to fix ___syscall220

---
 lib/emscripten/src/lib.rs           |  5 +++++
 lib/emscripten/src/syscalls/unix.rs | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs
index a96e263f6..ac5a4b282 100644
--- a/lib/emscripten/src/lib.rs
+++ b/lib/emscripten/src/lib.rs
@@ -76,6 +76,8 @@ lazy_static! {
 const GLOBAL_BASE: u32 = 1024;
 const STATIC_BASE: u32 = GLOBAL_BASE;
 
+use ::libc::DIR as libcDIR;
+
 pub struct EmscriptenData<'a> {
     pub malloc: Func<'a, u32, u32>,
     pub free: Func<'a, u32>,
@@ -83,6 +85,7 @@ pub struct EmscriptenData<'a> {
     pub memset: Func<'a, (u32, u32, u32), u32>,
     pub stack_alloc: Func<'a, u32, u32>,
     pub jumps: Vec<UnsafeCell<[u32; 27]>>,
+    pub opened_dirs: HashMap<i32, Box<*mut libcDIR>>,
 
     pub dyn_call_i: Option<Func<'a, i32, i32>>,
     pub dyn_call_ii: Option<Func<'a, (i32, i32), i32>>,
@@ -224,6 +227,8 @@ impl<'a> EmscriptenData<'a> {
             memset,
             stack_alloc,
             jumps: Vec::new(),
+            opened_dirs: HashMap::new(),
+
             dyn_call_i,
             dyn_call_ii,
             dyn_call_iii,
diff --git a/lib/emscripten/src/syscalls/unix.rs b/lib/emscripten/src/syscalls/unix.rs
index 51f892335..e6b2860c2 100644
--- a/lib/emscripten/src/syscalls/unix.rs
+++ b/lib/emscripten/src/syscalls/unix.rs
@@ -851,19 +851,25 @@ pub fn ___syscall196(ctx: &mut Ctx, _which: i32, mut varargs: VarArgs) -> i32 {
 // dirent structure is
 // i64, i64, u16 (280), i8, [i8; 256]
 pub fn ___syscall220(ctx: &mut Ctx, _which: i32, mut varargs: VarArgs) -> i32 {
-    debug!("emscripten::___syscall220");
+    use super::super::env::get_emscripten_data;
+
     let fd: i32 = varargs.get(ctx);
     let dirp_addr: i32 = varargs.get(ctx);
     let count: u32 = varargs.get(ctx);
+    debug!("emscripten::___syscall220 (getdents) {} {} {}", fd, dirp_addr, count);
 
     let dirp = emscripten_memory_pointer!(ctx.memory(0), dirp_addr) as *mut u8;
+
+    let mut opened_dirs = &mut get_emscripten_data(ctx).opened_dirs;
+
     // need to persist stream across calls?
-    let dir: *mut libc::DIR = unsafe { libc::fdopendir(fd) };
+    // let dir: *mut libc::DIR = unsafe { libc::fdopendir(fd) };
+    let mut dir = &*opened_dirs.entry(fd).or_insert_with(|| unsafe { Box::new(libc::fdopendir(fd)) });
 
     let mut pos = 0;
     let offset = 280;
     while pos + offset <= count as usize {
-        let dirent = unsafe { readdir(dir) };
+        let dirent = unsafe { readdir(**dir) };
         if dirent.is_null() {
             break;
         }