| Index: ppapi/native_client/src/trusted/plugin/utility.cc
|
| diff --git a/ppapi/native_client/src/trusted/plugin/utility.cc b/ppapi/native_client/src/trusted/plugin/utility.cc
|
| deleted file mode 100644
|
| index eaf525016f4b42e93bb8a231148f63d82920de8a..0000000000000000000000000000000000000000
|
| --- a/ppapi/native_client/src/trusted/plugin/utility.cc
|
| +++ /dev/null
|
| @@ -1,150 +0,0 @@
|
| -/*
|
| - * Copyright (c) 2011 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 <stdarg.h>
|
| -#include <stdlib.h>
|
| -#include <string.h>
|
| -
|
| -#include "native_client/src/include/portability_io.h"
|
| -#include "native_client/src/include/portability_process.h"
|
| -#include "native_client/src/shared/platform/nacl_check.h"
|
| -#include "ppapi/cpp/module.h"
|
| -#include "ppapi/native_client/src/trusted/plugin/utility.h"
|
| -
|
| -namespace plugin {
|
| -
|
| -int gNaClPluginDebugPrintEnabled = -1;
|
| -
|
| -/*
|
| - * Prints formatted message to the log.
|
| - */
|
| -int NaClPluginPrintLog(const char *format, ...) {
|
| - va_list arg;
|
| - int out_size;
|
| -
|
| - static const int kStackBufferSize = 512;
|
| - char stack_buffer[kStackBufferSize];
|
| -
|
| - // Just log locally to stderr if we can't use the nacl interface.
|
| - if (!GetNaClInterface()) {
|
| - va_start(arg, format);
|
| - int rc = vfprintf(stderr, format, arg);
|
| - va_end(arg);
|
| - return rc;
|
| - }
|
| -
|
| - va_start(arg, format);
|
| - out_size = vsnprintf(stack_buffer, kStackBufferSize, format, arg);
|
| - va_end(arg);
|
| - if (out_size < kStackBufferSize) {
|
| - GetNaClInterface()->Vlog(stack_buffer);
|
| - } else {
|
| - // Message too large for our stack buffer; we have to allocate memory
|
| - // instead.
|
| - char *buffer = static_cast<char*>(malloc(out_size + 1));
|
| - va_start(arg, format);
|
| - vsnprintf(buffer, out_size + 1, format, arg);
|
| - va_end(arg);
|
| - GetNaClInterface()->Vlog(buffer);
|
| - free(buffer);
|
| - }
|
| - return out_size;
|
| -}
|
| -
|
| -/*
|
| - * Currently looks for presence of NACL_PLUGIN_DEBUG and returns
|
| - * 0 if absent and 1 if present. In the future we may include notions
|
| - * of verbosity level.
|
| - */
|
| -int NaClPluginDebugPrintCheckEnv() {
|
| - char* env = getenv("NACL_PLUGIN_DEBUG");
|
| - return (NULL != env);
|
| -}
|
| -
|
| -bool IsValidIdentifierString(const char* strval, uint32_t* length) {
|
| - // This function is supposed to recognize valid ECMAScript identifiers,
|
| - // as described in
|
| - // http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf
|
| - // It is currently restricted to only the ASCII subset.
|
| - // TODO(sehr): Recognize the full Unicode formulation of identifiers.
|
| - // TODO(sehr): Make this table-driven if efficiency becomes a problem.
|
| - if (NULL != length) {
|
| - *length = 0;
|
| - }
|
| - if (NULL == strval) {
|
| - return false;
|
| - }
|
| - static const char* kValidFirstChars =
|
| - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz$_";
|
| - static const char* kValidOtherChars =
|
| - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz$_"
|
| - "0123456789";
|
| - if (NULL == strchr(kValidFirstChars, strval[0])) {
|
| - return false;
|
| - }
|
| - uint32_t pos;
|
| - for (pos = 1; ; ++pos) {
|
| - if (0 == pos) {
|
| - // Unsigned overflow.
|
| - return false;
|
| - }
|
| - int c = strval[pos];
|
| - if (0 == c) {
|
| - break;
|
| - }
|
| - if (NULL == strchr(kValidOtherChars, c)) {
|
| - return false;
|
| - }
|
| - }
|
| - if (NULL != length) {
|
| - *length = pos;
|
| - }
|
| - return true;
|
| -}
|
| -
|
| -// We cache the NaCl interface pointer and ensure that its set early on, on the
|
| -// main thread. This allows GetNaClInterface() to be used from non-main threads.
|
| -static const PPB_NaCl_Private* g_nacl_interface = NULL;
|
| -
|
| -const PPB_NaCl_Private* GetNaClInterface() {
|
| - return g_nacl_interface;
|
| -}
|
| -
|
| -void SetNaClInterface(const PPB_NaCl_Private* nacl_interface) {
|
| - g_nacl_interface = nacl_interface;
|
| -}
|
| -
|
| -void CloseFileHandle(PP_FileHandle file_handle) {
|
| -#if NACL_WINDOWS
|
| - CloseHandle(file_handle);
|
| -#else
|
| - close(file_handle);
|
| -#endif
|
| -}
|
| -
|
| -// Converts a PP_FileHandle to a POSIX file descriptor.
|
| -int32_t ConvertFileDescriptor(PP_FileHandle handle, bool read_only) {
|
| - PLUGIN_PRINTF(("ConvertFileDescriptor, handle=%d\n", handle));
|
| -#if NACL_WINDOWS
|
| - int32_t file_desc = NACL_NO_FILE_DESC;
|
| - // On Windows, valid handles are 32 bit unsigned integers so this is safe.
|
| - file_desc = reinterpret_cast<intptr_t>(handle);
|
| - // Convert the Windows HANDLE from Pepper to a POSIX file descriptor.
|
| - int flags = _O_BINARY;
|
| - flags |= read_only ? _O_RDONLY : _O_RDWR;
|
| - int32_t posix_desc = _open_osfhandle(file_desc, flags);
|
| - if (posix_desc == -1) {
|
| - // Close the Windows HANDLE if it can't be converted.
|
| - CloseHandle(reinterpret_cast<HANDLE>(file_desc));
|
| - return -1;
|
| - }
|
| - return posix_desc;
|
| -#else
|
| - return handle;
|
| -#endif
|
| -}
|
| -
|
| -} // namespace plugin
|
|
|