JavaScriptBench
diff --git a/‎system/lib/wasmfs/syscalls.cpp‎
Lines changed: 2 additions & 1 deletion b/‎system/lib/wasmfs/syscalls.cpp‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎tests/wasmfs/wasmfs_chdir.c‎
Lines changed: 19 additions & 9 deletions b/‎tests/wasmfs/wasmfs_chdir.c‎
Lines changed: 19 additions & 9 deletions
@@ -632,8 +632,9 @@ long __syscall_getcwd(long buf, long size) {
   // Return value is a null-terminated c string.
   strcpy((char*)buf, res);
 
-  return 0;
+  return buf;
 }
+
 __wasi_errno_t __wasi_fd_fdstat_get(__wasi_fd_t fd, __wasi_fdstat_t* stat) {
   // TODO: This is only partial implementation of __wasi_fd_fdstat_get. Enough
   // to get __wasi_fd_is_valid working.
 
@@ -22,58 +22,68 @@ int main() {
 
   // Try to print the root directory.
   char cwd[100];
-  getcwd(cwd, sizeof(cwd));
+  char* ret;
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir: %s\n", cwd);
 
   // Try to switch to /working.
   chdir("working");
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir: %s\n", cwd);
 
   // Try to switch back to the root directory.
   chdir("/");
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir: %s\n", cwd);
 
   // Try to switch to a subdirectory of working.
   chdir("/working/test");
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir: %s\n", cwd);
 
   // Try to switch to a non-existent relative path from subdirectory.
   // Changing to working in /working/test should fail.
   chdir("working");
   printf("Errno: %s\n", strerror(errno));
   assert(errno == ENOENT);
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir is still: %s\n", cwd);
 
   // Try to switch back to absolute path /working.
   errno = 0;
   chdir("/working");
   printf("Errno: %s\n", strerror(errno));
   assert(errno == 0);
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir is now: %s\n", cwd);
 
   // Try to switch to a non-existent absolute path.
   errno = 0;
   chdir("/foobar");
   printf("Errno: %s\n", strerror(errno));
   assert(errno == ENOENT);
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir is still: %s\n", cwd);
 
   // Try to switch to /dev.
   chdir("/dev");
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir: %s\n", cwd);
 
   // Try to change cwd to a file.
   chdir("/dev/stdout");
   printf("Errno: %s\n", strerror(errno));
   assert(errno == ENOTDIR);
-  getcwd(cwd, sizeof(cwd));
+  ret = getcwd(cwd, sizeof(cwd));
+  assert(ret == cwd);
   printf("Current working dir is still: %s\n", cwd);
 
   // Try to pass a size of 0.