| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 | 6 |
| 7 #include "native_client/src/public/chrome_main.h" | 7 #include "native_client/src/public/chrome_main.h" |
| 8 | 8 |
| 9 #include "native_client/src/include/portability.h" | 9 #include "native_client/src/include/portability.h" |
| 10 #include "native_client/src/include/portability_io.h" | 10 #include "native_client/src/include/portability_io.h" |
| 11 #include "native_client/src/include/portability_sockets.h" | 11 #include "native_client/src/include/portability_sockets.h" |
| 12 | 12 |
| 13 #include <stdio.h> | 13 #include <stdio.h> |
| 14 #include <string.h> | 14 #include <string.h> |
| 15 | 15 |
| 16 #include "native_client/src/include/nacl_macros.h" | 16 #include "native_client/src/include/nacl_macros.h" |
| 17 #include "native_client/src/public/nacl_app.h" | 17 #include "native_client/src/public/nacl_app.h" |
| 18 #include "native_client/src/shared/platform/nacl_check.h" | 18 #include "native_client/src/shared/platform/nacl_check.h" |
| 19 #include "native_client/src/shared/platform/nacl_exit.h" | 19 #include "native_client/src/shared/platform/nacl_exit.h" |
| 20 #include "native_client/src/shared/platform/nacl_log.h" | 20 #include "native_client/src/shared/platform/nacl_log.h" |
| 21 #include "native_client/src/shared/platform/nacl_secure_random.h" | 21 #include "native_client/src/shared/platform/nacl_secure_random.h" |
| 22 #include "native_client/src/shared/platform/nacl_sync.h" | 22 #include "native_client/src/shared/platform/nacl_sync.h" |
| 23 #include "native_client/src/shared/platform/nacl_sync_checked.h" | 23 #include "native_client/src/shared/platform/nacl_sync_checked.h" |
| 24 #include "native_client/src/trusted/desc/nacl_desc_io.h" | 24 #include "native_client/src/trusted/desc/nacl_desc_io.h" |
| 25 #include "native_client/src/trusted/fault_injection/fault_injection.h" | 25 #include "native_client/src/trusted/fault_injection/fault_injection.h" |
| 26 #include "native_client/src/trusted/gio/gio_nacl_desc.h" | |
| 27 #include "native_client/src/trusted/service_runtime/env_cleanser.h" | 26 #include "native_client/src/trusted/service_runtime/env_cleanser.h" |
| 28 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" | 27 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" |
| 29 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h" | 28 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h" |
| 30 #include "native_client/src/trusted/service_runtime/nacl_app.h" | 29 #include "native_client/src/trusted/service_runtime/nacl_app.h" |
| 31 #include "native_client/src/trusted/service_runtime/nacl_bootstrap_channel_error
_reporter.h" | 30 #include "native_client/src/trusted/service_runtime/nacl_bootstrap_channel_error
_reporter.h" |
| 32 #include "native_client/src/trusted/service_runtime/nacl_error_log_hook.h" | 31 #include "native_client/src/trusted/service_runtime/nacl_error_log_hook.h" |
| 33 #include "native_client/src/trusted/service_runtime/nacl_globals.h" | 32 #include "native_client/src/trusted/service_runtime/nacl_globals.h" |
| 34 #include "native_client/src/trusted/service_runtime/nacl_debug_init.h" | 33 #include "native_client/src/trusted/service_runtime/nacl_debug_init.h" |
| 35 #include "native_client/src/trusted/service_runtime/nacl_signal.h" | 34 #include "native_client/src/trusted/service_runtime/nacl_signal.h" |
| 36 #include "native_client/src/trusted/service_runtime/osx/mach_exception_handler.h
" | 35 #include "native_client/src/trusted/service_runtime/osx/mach_exception_handler.h
" |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 456 int NaClChromeMainStart(struct NaClApp *nap, | 455 int NaClChromeMainStart(struct NaClApp *nap, |
| 457 struct NaClChromeMainArgs *args, | 456 struct NaClChromeMainArgs *args, |
| 458 int *exit_status) { | 457 int *exit_status) { |
| 459 int load_ok = LOAD_OK == LoadApp(nap, args); | 458 int load_ok = LOAD_OK == LoadApp(nap, args); |
| 460 if (load_ok) { | 459 if (load_ok) { |
| 461 *exit_status = StartApp(nap, args); | 460 *exit_status = StartApp(nap, args); |
| 462 } | 461 } |
| 463 free(args); | 462 free(args); |
| 464 return load_ok; | 463 return load_ok; |
| 465 } | 464 } |
| OLD | NEW |