[NaCl SDK] Remove syscalls wrappers for chmod and unlink.

native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "nacl_io/kernel_intercept.h"
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
@@ skipping 30 matching lines @@
   assert(s_saved_state.kp == NULL);
   if (s_saved_state.kp != NULL)
     return 1;
   s_saved_state = s_state;
   s_state.kp = NULL;
   s_state.ppapi = NULL;
   s_state.kp_owned = false;
   return 0;
 }
 
+static void ki_pop_state() {
+  // Swap out the KernelProxy. This will normally reset the
+  // proxy to NULL, aside from in test code that has called
+  // ki_push_state_for_testing().
+  s_state = s_saved_state;
+  s_saved_state.kp = NULL;
+  s_saved_state.ppapi = NULL;
+  s_saved_state.kp_owned = false;
+}
+
+int ki_pop_state_for_testing() {
+  ki_pop_state();
+  return 0;
+}
+
 int ki_init(void* kp) {
   LOG_TRACE("ki_init: %p", kp);
   return ki_init_ppapi(kp, 0, NULL);
 }
 
 int ki_init_ppapi(void* kp,
                   PP_Instance instance,
                   PPB_GetInterface get_browser_interface) {
   assert(!s_state.kp);
   if (s_state.kp != NULL)
@@ skipping 35 matching lines @@
 
 void ki_uninit() {
   LOG_TRACE("ki_uninit");
   if (s_saved_state.kp == NULL)
     kernel_wrap_uninit();
 
   // If we are going to delete the KernelProxy don't do it
   // until we've swapped it out.
   KernelInterceptState state_to_delete = s_state;
 
-  // Swap out the KernelProxy. This will normally reset the
-  // proxy to NULL, aside from in test code that has called
-  // ki_push_state_for_testing().
-  s_state = s_saved_state;
-  s_saved_state.kp = NULL;
-  s_saved_state.ppapi = NULL;
-  s_saved_state.kp_owned = false;
+  ki_pop_state();
 
   if (state_to_delete.kp_owned)
     delete state_to_delete.kp;
 
   delete state_to_delete.ppapi;
 }
 
 nacl_io::KernelProxy* ki_get_proxy() {
   return s_state.kp;
 }
 
 int ki_chdir(const char* path) {
   ON_NOSYS_RETURN(-1);
   return s_state.kp->chdir(path);
 }
 
 void ki_exit(int status) {
   if (ki_is_initialized())
     s_state.kp->exit(status);
 
   _real_exit(status);
 }
 
 char* ki_getcwd(char* buf, size_t size) {
-  // gtest uses getcwd in a static initializer. If we haven't initialized the
-  // kernel-intercept yet, just return ".".
+  // gtest uses getcwd in a static initializer and expects it to always
+  // succeed.  If we haven't initialized kernel-intercept yet, they try

[binji, 2014/08/20 18:13:35]

s/they/then/

[Sam Clegg, 2014/08/21 10:19:33]

Done.

+  // the IRT's getcwd, and fall back to just returning ".".
   if (!ki_is_initialized()) {
-    if (size < 2) {
-      errno = ERANGE;
-      return NULL;
+    int rtn = _real_getcwd(buf, size);
+    if (rtn != 0) {
+      if (rtn == ENOSYS) {
+        buf[0] = '.';
+        buf[1] = 0;
+      } else {
+        errno = rtn;
+        return NULL;
+      }
     }
-    buf[0] = '.';
-    buf[1] = 0;
     return buf;
   }
   return s_state.kp->getcwd(buf, size);
 }
 
 char* ki_getwd(char* buf) {
   ON_NOSYS_RETURN(NULL);
   return s_state.kp->getwd(buf);
 }
 
@@ skipping 401 matching lines @@
 int ki_socket(int domain, int type, int protocol) {
   ON_NOSYS_RETURN(-1);
   return s_state.kp->socket(domain, type, protocol);
 }
 
 int ki_socketpair(int domain, int type, int protocol, int* sv) {
   ON_NOSYS_RETURN(-1);
   return s_state.kp->socketpair(domain, type, protocol, sv);
 }
 #endif  // PROVIDES_SOCKET_API