fix file creation ts for WASI Linux

wasmerio · May 20, 2019 · f2001fe · f2001fe
1 parent d7d17bd
commit f2001fe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/lib/wasi/src/state.rs b/lib/wasi/src/state.rs
@@ -488,10 +488,10 @@ pub fn get_stat_for_kind(kind: &Kind) -> Option<__wasi_filestat_t> {
                         .as_nanos() as u64,
                     st_ctim: md
                         .created()
-                        .ok()?
-                        .duration_since(SystemTime::UNIX_EPOCH)
-                        .ok()?
-                        .as_nanos() as u64,
+                        .ok()
+                        .and_then(|ct| ct.duration_since(SystemTime::UNIX_EPOCH).ok())
+                        .map(|ct| ct.as_nanos() as u64)
+                        .unwrap_or(0),
                     ..__wasi_filestat_t::default()
                 })
             }
@@ -515,10 +515,10 @@ pub fn get_stat_for_kind(kind: &Kind) -> Option<__wasi_filestat_t> {
                     .as_nanos() as u64,
                 st_ctim: md
                     .created()
-                    .ok()?
-                    .duration_since(SystemTime::UNIX_EPOCH)
-                    .ok()?
-                    .as_nanos() as u64,
+                    .ok()
+                    .and_then(|ct| ct.duration_since(SystemTime::UNIX_EPOCH).ok())
+                    .map(|ct| ct.as_nanos() as u64)
+                    .unwrap_or(0),
                 ..__wasi_filestat_t::default()
             })
         }

diff --git a/lib/wasi/wasitests/file_metadata b/lib/wasi/wasitests/file_metadata
diff --git a/lib/wasi/wasitests/file_metadata.out b/lib/wasi/wasitests/file_metadata.out
@@ -1,3 +1,3 @@
 is dir: false
 filetype: false true false
-file info: 491
+file info: 456
diff --git a/lib/wasi/wasitests/file_metadata.rs b/lib/wasi/wasitests/file_metadata.rs
@@ -13,5 +13,5 @@ fn main() {
         filetype.is_file(),
         filetype.is_symlink()
     );
-    println!("file info: {} {} {}", md.len(), md.modified(), md.created());
+    println!("file info: {}", md.len());
 }
diff --git a/lib/wasi/wasitests/file_metadata.wasm b/lib/wasi/wasitests/file_metadata.wasm