[NaCl SDK] Get nacl_mounts_tests building.

native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc

Index: native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc
diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc b/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc
index 67a207d97a952f401b40fc13890872b251d74a60..e048e127f4dbdee39f980ba280c9b9a94add286b 100644
--- a/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc
+++ b/native_client_sdk/src/libraries/nacl_mounts_test/kernel_proxy_test.cc
@@ -6,9 +6,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
-#include <sys/mount.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include <map>
 #include <string>
@@ -20,7 +18,6 @@
 #include "nacl_mounts/mount_mem.h"
 #include "nacl_mounts/path.h"
 
-#define __STDC__ 1
 #include "gtest/gtest.h"
 
 
@@ -30,37 +27,37 @@ TEST(KernelProxy, WorkingDirectory) {
   ki_init(new KernelProxy());
 
   text[0] = 0;
-  getcwd(text, sizeof(text));
+  ki_getcwd(text, sizeof(text));
   EXPECT_STREQ("/", text);
 
-  char* alloc = getwd(NULL);
+  char* alloc = ki_getwd(NULL);
   EXPECT_EQ((char *) NULL, alloc);
   EXPECT_EQ(EFAULT, errno);
 
   text[0] = 0;
-  alloc = getwd(text);
+  alloc = ki_getwd(text);
   EXPECT_STREQ("/", alloc);
 
-  EXPECT_EQ(-1, chdir("/foo"));
+  EXPECT_EQ(-1, ki_chdir("/foo"));
   EXPECT_EQ(EEXIST, errno);
 
-  EXPECT_EQ(0, chdir("/"));
+  EXPECT_EQ(0, ki_chdir("/"));
 
-  EXPECT_EQ(0, mkdir("/foo", S_IREAD | S_IWRITE));
-  EXPECT_EQ(-1, mkdir("/foo", S_IREAD | S_IWRITE));
+  EXPECT_EQ(0, ki_mkdir("/foo", S_IREAD | S_IWRITE));
+  EXPECT_EQ(-1, ki_mkdir("/foo", S_IREAD | S_IWRITE));
   EXPECT_EQ(EEXIST, errno);
 
   memset(text, 0, sizeof(text));
-  EXPECT_EQ(0, chdir("foo"));
-  EXPECT_EQ(text, getcwd(text, sizeof(text)));
+  EXPECT_EQ(0, ki_chdir("foo"));
+  EXPECT_EQ(text, ki_getcwd(text, sizeof(text)));
   EXPECT_STREQ("/foo", text);
 
   memset(text, 0, sizeof(text));
-  EXPECT_EQ(-1, chdir("foo"));
+  EXPECT_EQ(-1, ki_chdir("foo"));
   EXPECT_EQ(EEXIST, errno);
-  EXPECT_EQ(0, chdir(".."));
-  EXPECT_EQ(0, chdir("/foo"));
-  EXPECT_EQ(text, getcwd(text, sizeof(text)));
+  EXPECT_EQ(0, ki_chdir(".."));
+  EXPECT_EQ(0, ki_chdir("/foo"));
+  EXPECT_EQ(text, ki_getcwd(text, sizeof(text)));
   EXPECT_STREQ("/foo", text);
 }
 
@@ -72,52 +69,52 @@ TEST(KernelProxy, MemMountIO) {
   ki_init(new KernelProxy());
 
   // Create "/foo"
-  EXPECT_EQ(0, mkdir("/foo", S_IREAD | S_IWRITE));
+  EXPECT_EQ(0, ki_mkdir("/foo", S_IREAD | S_IWRITE));
 
   // Fail to open "/foo/bar"
-  EXPECT_EQ(-1, open("/foo/bar", O_RDONLY));
+  EXPECT_EQ(-1, ki_open("/foo/bar", O_RDONLY));
   EXPECT_EQ(ENOENT, errno);
 
   // Create bar "/foo/bar"
-  fd1 = open("/foo/bar", O_RDONLY | O_CREAT);
+  fd1 = ki_open("/foo/bar", O_RDONLY | O_CREAT);
   EXPECT_NE(-1, fd1);
 
   // Open (optionally create) bar "/foo/bar"
-  fd2 = open("/foo/bar", O_RDONLY | O_CREAT);
+  fd2 = ki_open("/foo/bar", O_RDONLY | O_CREAT);
   EXPECT_NE(-1, fd2);
 
   // Fail to exclusively create bar "/foo/bar"
-  EXPECT_EQ(-1, open("/foo/bar", O_RDONLY | O_CREAT | O_EXCL));
+  EXPECT_EQ(-1, ki_open("/foo/bar", O_RDONLY | O_CREAT | O_EXCL));
   EXPECT_EQ(EEXIST, errno);
 
   // Write hello and world to same node with different descriptors
   // so that we overwrite each other
-  EXPECT_EQ(5, write(fd2, "WORLD", 5));
-  EXPECT_EQ(5, write(fd1, "HELLO", 5));
+  EXPECT_EQ(5, ki_write(fd2, "WORLD", 5));
+  EXPECT_EQ(5, ki_write(fd1, "HELLO", 5));
 
-  fd3 = open("/foo/bar", O_WRONLY);
+  fd3 = ki_open("/foo/bar", O_WRONLY);
   EXPECT_NE(-1, fd3);
 
-  len = read(fd3, text, sizeof(text));
+  len = ki_read(fd3, text, sizeof(text));
   if (len > -0) text[len] = 0;
   EXPECT_EQ(5, len);
   EXPECT_STREQ("HELLO", text);
-  EXPECT_EQ(0, close(fd1));
-  EXPECT_EQ(0, close(fd2));
+  EXPECT_EQ(0, ki_close(fd1));
+  EXPECT_EQ(0, ki_close(fd2));
 
-  fd1 = open("/foo/bar", O_WRONLY | O_APPEND);
+  fd1 = ki_open("/foo/bar", O_WRONLY | O_APPEND);
   EXPECT_NE(-1, fd1);
-  EXPECT_EQ(5, write(fd1, "WORLD", 5));
+  EXPECT_EQ(5, ki_write(fd1, "WORLD", 5));
 
-  len = read(fd3, text, sizeof(text));
+  len = ki_read(fd3, text, sizeof(text));
   if (len >= 0) text[len] = 0;
 
   EXPECT_EQ(5, len);
   EXPECT_STREQ("WORLD", text);
 
-  fd2 = open("/foo/bar", O_RDONLY);
+  fd2 = ki_open("/foo/bar", O_RDONLY);
   EXPECT_NE(-1, fd2);
-  len = read(fd2, text, sizeof(text));
+  len = ki_read(fd2, text, sizeof(text));
   if (len > 0) text[len] = 0;
   EXPECT_EQ(10, len);
   EXPECT_STREQ("HELLOWORLD", text);
@@ -144,13 +141,13 @@ class KernelProxyMountMock : public KernelProxy {
 
 TEST(KernelProxy, MountInit) {
   ki_init(new KernelProxyMountMock());
-  int res1 = mount("/", "/mnt1", "initfs", 0, "false,foo=bar");
+  int res1 = ki_mount("/", "/mnt1", "initfs", 0, "false,foo=bar");
 
   EXPECT_EQ("bar", g_StringMap["foo"]);
   EXPECT_EQ(-1, res1);
   EXPECT_EQ(EINVAL, errno);
 
-  int res2 = mount("/", "/mnt2", "initfs", 0, "true,bar=foo,x=y");
+  int res2 = ki_mount("/", "/mnt2", "initfs", 0, "true,bar=foo,x=y");
   EXPECT_NE(-1, res2);
   EXPECT_EQ("y", g_StringMap["x"]);
-}
+}