| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/chrome_application_mac.h" | 5 #include "base/chrome_application_mac.h" |
| 6 #include "base/environment.h" | 6 #include "base/environment.h" |
| 7 #include "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "chrome/common/plugin_carbon_interpose_constants_mac.h" | 9 #include "chrome/common/plugin_carbon_interpose_constants_mac.h" |
| 10 #include "chrome/plugin/plugin_interpose_util_mac.h" | 10 #include "chrome/plugin/plugin_interpose_util_mac.h" |
| 11 | 11 |
| 12 #if !defined(__LP64__) | 12 #if !defined(__LP64__) |
| 13 void TrimInterposeEnvironment() { | 13 void TrimInterposeEnvironment() { |
| 14 scoped_ptr<base::Environment> env(base::Environment::Create()); | 14 scoped_ptr<base::Environment> env(base::Environment::Create()); |
| 15 | 15 |
| 16 std::string interpose_list; | 16 std::string interpose_list; |
| 17 if (!env->GetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey, | 17 if (!env->GetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey, |
| 18 &interpose_list)) { | 18 &interpose_list)) { |
| 19 NOTREACHED() << "No interposing libraries set"; | 19 NOTREACHED() << "No interposing libraries set"; |
| 20 return; | 20 return; |
| 21 } | 21 } |
| 22 | 22 |
| 23 // The list is a :-separated list of paths. Because we append our interpose | 23 // The list is a :-separated list of paths. Because we append our interpose |
| 24 // library just before forking in plugin_process_host.cc, the only cases we | 24 // library just before forking in plugin_process_host.cc, the only cases we |
| 25 // need to handle are: | 25 // need to handle are: |
| 26 // 1) The whole string is "<kInterposeLibraryPath>", so just clear it, or | 26 // 1) The whole string is "<kInterposeLibraryPath>", so just clear it, or |
| 27 // 2) ":<kInterposeLibraryPath>" is the end of the string, so trim and re-set. | 27 // 2) ":<kInterposeLibraryPath>" is the end of the string, so trim and re-set. |
| 28 int suffix_offset = strlen(interpose_list.c_str()) - | 28 std::string interpose_library_path( |
| 29 strlen(plugin_interpose_strings::kInterposeLibraryPath); | 29 plugin_interpose_strings::kInterposeLibraryPath); |
| 30 | 30 DCHECK_GE(interpose_list.size(), interpose_library_path.size()); |
| 31 size_t suffix_offset = interpose_list.size() - interpose_library_path.size(); |
| 31 if (suffix_offset == 0 && | 32 if (suffix_offset == 0 && |
| 32 strcmp(interpose_list.c_str(), | 33 interpose_list == interpose_library_path) { |
| 33 plugin_interpose_strings::kInterposeLibraryPath) == 0) { | |
| 34 env->UnSetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey); | 34 env->UnSetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey); |
| 35 } else if (suffix_offset > 0 && interpose_list[suffix_offset - 1] == ':' && | 35 } else if (suffix_offset > 0 && interpose_list[suffix_offset - 1] == ':' && |
| 36 strcmp(interpose_list.c_str() + suffix_offset, | 36 interpose_list.substr(suffix_offset) == interpose_library_path) { |
| 37 plugin_interpose_strings::kInterposeLibraryPath) == 0) { | |
| 38 std::string trimmed_list = interpose_list.substr(0, suffix_offset - 1); | 37 std::string trimmed_list = interpose_list.substr(0, suffix_offset - 1); |
| 39 env->SetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey, | 38 env->SetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey, |
| 40 trimmed_list.c_str()); | 39 trimmed_list.c_str()); |
| 41 } else { | 40 } else { |
| 42 NOTREACHED() << "Missing Carbon interposing library"; | 41 NOTREACHED() << "Missing Carbon interposing library"; |
| 43 } | 42 } |
| 44 } | 43 } |
| 45 #endif | 44 #endif |
| 46 | 45 |
| 47 void InitializeChromeApplication() { | 46 void InitializeChromeApplication() { |
| 48 [CrApplication sharedApplication]; | 47 [CrApplication sharedApplication]; |
| 49 | 48 |
| 50 mac_plugin_interposing::SetUpCocoaInterposing(); | 49 mac_plugin_interposing::SetUpCocoaInterposing(); |
| 51 } | 50 } |
| OLD | NEW |