From ed45566a74d2a8dae55ab4e2589ce5f0d78e49b2 Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Wed, 28 Oct 2009 02:30:43 +0000 Subject: Filter out hidden files, both when loading extensions and when packaging them. We also special case the common OS X zip dropping "__MACOSX" when loading extensions. BUG=23004 Review URL: http://codereview.chromium.org/340018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30312 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_creator.cc | 2 +- chrome/browser/extensions/extension_file_util.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome/browser/extensions') diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 8f65ad5..d9bc4d6 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -123,7 +123,7 @@ bool ExtensionCreator::CreateZip(const FilePath& extension_dir, file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("chrome_"), zip_path); *zip_path = zip_path->Append(FILE_PATH_LITERAL("extension.zip")); - if (!Zip(extension_dir, *zip_path)) { + if (!Zip(extension_dir, *zip_path, false)) { // no hidden files error_message_ = "Failed to create temporary zip file during packaging."; return false; } diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc index 5b1e16c..26a551b 100644 --- a/chrome/browser/extensions/extension_file_util.cc +++ b/chrome/browser/extensions/extension_file_util.cc @@ -384,7 +384,8 @@ bool CheckForIllegalFilenames(const FilePath& extension_path, std::string* error) { // Reserved underscore names. static const char* reserved_names[] = { - Extension::kLocaleFolder + Extension::kLocaleFolder, + "__MACOSX" }; static std::set reserved_underscore_names( reserved_names, reserved_names + arraysize(reserved_names)); -- cgit v1.1