| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/zygote_host_linux.h" | 5 #include "content/browser/zygote_host_linux.h" |
| 6 | 6 |
| 7 #include <sys/socket.h> | 7 #include <sys/socket.h> |
| 8 #include <sys/stat.h> | 8 #include <sys/stat.h> |
| 9 #include <sys/types.h> | 9 #include <sys/types.h> |
| 10 #include <unistd.h> | 10 #include <unistd.h> |
| 11 | 11 |
| 12 #include "base/base_switches.h" | 12 #include "base/base_switches.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/eintr_wrapper.h" | 14 #include "base/eintr_wrapper.h" |
| 15 #include "base/environment.h" | 15 #include "base/environment.h" |
| 16 #include "base/linux_util.h" | 16 #include "base/linux_util.h" |
| 17 #include "base/logging.h" | 17 #include "base/logging.h" |
| 18 #include "base/memory/scoped_ptr.h" | 18 #include "base/memory/scoped_ptr.h" |
| 19 #include "base/path_service.h" | 19 #include "base/path_service.h" |
| 20 #include "base/pickle.h" | 20 #include "base/pickle.h" |
| 21 #include "base/process_util.h" | 21 #include "base/process_util.h" |
| 22 #include "base/string_number_conversions.h" | 22 #include "base/string_number_conversions.h" |
| 23 #include "base/string_util.h" | 23 #include "base/string_util.h" |
| 24 #include "base/utf_string_conversions.h" | 24 #include "base/utf_string_conversions.h" |
| 25 #include "chrome/common/chrome_constants.h" | |
| 26 #include "content/browser/content_browser_client.h" | 25 #include "content/browser/content_browser_client.h" |
| 27 #include "content/browser/renderer_host/render_sandbox_host_linux.h" | 26 #include "content/browser/renderer_host/render_sandbox_host_linux.h" |
| 28 #include "content/common/content_switches.h" | 27 #include "content/common/content_switches.h" |
| 29 #include "content/common/process_watcher.h" | 28 #include "content/common/process_watcher.h" |
| 30 #include "content/common/result_codes.h" | 29 #include "content/common/result_codes.h" |
| 31 #include "content/common/unix_domain_socket_posix.h" | 30 #include "content/common/unix_domain_socket_posix.h" |
| 32 #include "sandbox/linux/suid/suid_unsafe_environment_variables.h" | 31 #include "sandbox/linux/suid/suid_unsafe_environment_variables.h" |
| 33 | 32 |
| 34 static void SaveSUIDUnsafeEnvironmentVariables() { | 33 static void SaveSUIDUnsafeEnvironmentVariables() { |
| 35 // The ELF loader will clear many environment variables so we save them to | 34 // The ELF loader will clear many environment variables so we save them to |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 !read_pickle.ReadInt(&iter, &tmp_exit_code)) { | 362 !read_pickle.ReadInt(&iter, &tmp_exit_code)) { |
| 364 LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote."; | 363 LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote."; |
| 365 return base::TERMINATION_STATUS_NORMAL_TERMINATION; | 364 return base::TERMINATION_STATUS_NORMAL_TERMINATION; |
| 366 } | 365 } |
| 367 | 366 |
| 368 if (exit_code) | 367 if (exit_code) |
| 369 *exit_code = tmp_exit_code; | 368 *exit_code = tmp_exit_code; |
| 370 | 369 |
| 371 return static_cast<base::TerminationStatus>(status); | 370 return static_cast<base::TerminationStatus>(status); |
| 372 } | 371 } |
| OLD | NEW |