diff options
| author | sbc <sbc@chromium.org> | 2015-05-15 21:17:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-16 04:17:33 +0000 |
| commit | 122d247af7841b388e22b22f0605a1c5b6ca490f (patch) | |
| tree | 74c1222ad7fcecc87c18556eb1721ef4509bf13f | |
| parent | 588427cc4c76ed7ef48af26df8718469d1169d4b (diff) | |
| download | chromium_src-122d247af7841b388e22b22f0605a1c5b6ca490f.zip chromium_src-122d247af7841b388e22b22f0605a1c5b6ca490f.tar.gz chromium_src-122d247af7841b388e22b22f0605a1c5b6ca490f.tar.bz2 | |
nacl_io: Add glibc IRT redirect for rename syscall
This means we can remove the direct intercept, which
is currently causing lua5.2 tests to fail on the
naclports tree.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk
Review URL: https://codereview.chromium.org/1127103006
Cr-Commit-Position: refs/heads/master@{#330279}
3 files changed, 5 insertions, 11 deletions
diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc index 308a092..158c52a 100644 --- a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc +++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_glibc.cc @@ -175,6 +175,7 @@ EXTERN_C_BEGIN OP(fdatasync); \ OP(lstat); \ OP(link); \ + OP(rename); \ OP(readlink); \ OP(utimes); @@ -348,6 +349,10 @@ int WRAP(link)(const char* pathname, const char* newpath) { ERRNO_RTN(ki_link(pathname, newpath)); } +int WRAP(rename)(const char* pathname, const char* newpath) { + ERRNO_RTN(ki_rename(pathname, newpath)); +} + int WRAP(readlink)(const char* pathname, char* buf, size_t count, diff --git a/native_client_sdk/src/libraries/nacl_io/library.dsc b/native_client_sdk/src/libraries/nacl_io/library.dsc index 5f20abd..3c67053 100644 --- a/native_client_sdk/src/libraries/nacl_io/library.dsc +++ b/native_client_sdk/src/libraries/nacl_io/library.dsc @@ -81,7 +81,6 @@ "syscalls/pipe.c", "syscalls/poll.c", "syscalls/realpath.c", - "syscalls/rename.c", "syscalls/select.c", "syscalls/sigaction.c", "syscalls/signal.c", diff --git a/native_client_sdk/src/libraries/nacl_io/syscalls/rename.c b/native_client_sdk/src/libraries/nacl_io/syscalls/rename.c deleted file mode 100644 index 8ad73af..0000000 --- a/native_client_sdk/src/libraries/nacl_io/syscalls/rename.c +++ /dev/null @@ -1,10 +0,0 @@ -/* Copyright (c) 2013 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 "nacl_io/kernel_wrap.h" - -int rename(const char* path, const char* newpath) { - return ki_rename(path, newpath); -} |