From 53c38b15381ace565227e49104a6fd64c4c28dcc Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Wed, 10 May 2017 14:47:45 -0700 Subject: kill package_extract_dir It's only used by file-based OTA which has been deprecated for O. Test: mma Change-Id: I439c93155ca94554d827142c99aa6c0845cc7561 --- otautil/Android.bp | 1 - otautil/ZipUtil.cpp | 120 ---------------------------------------------------- otautil/ZipUtil.h | 57 ------------------------- 3 files changed, 178 deletions(-) delete mode 100644 otautil/ZipUtil.cpp delete mode 100644 otautil/ZipUtil.h (limited to 'otautil') diff --git a/otautil/Android.bp b/otautil/Android.bp index 0b2314374..a2eaa0402 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -18,7 +18,6 @@ cc_library_static { srcs: [ "SysUtil.cpp", "DirUtil.cpp", - "ZipUtil.cpp", "ThermalUtil.cpp", ], diff --git a/otautil/ZipUtil.cpp b/otautil/ZipUtil.cpp deleted file mode 100644 index 9cc97e499..000000000 --- a/otautil/ZipUtil.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "ZipUtil.h" - -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -#include "DirUtil.h" - -static constexpr mode_t UNZIP_DIRMODE = 0755; -static constexpr mode_t UNZIP_FILEMODE = 0644; - -bool ExtractPackageRecursive(ZipArchiveHandle zip, const std::string& zip_path, - const std::string& dest_path, const struct utimbuf* timestamp, - struct selabel_handle* sehnd) { - if (!zip_path.empty() && zip_path[0] == '/') { - LOG(ERROR) << "ExtractPackageRecursive(): zip_path must be a relative path " << zip_path; - return false; - } - if (dest_path.empty() || dest_path[0] != '/') { - LOG(ERROR) << "ExtractPackageRecursive(): dest_path must be an absolute path " << dest_path; - return false; - } - - void* cookie; - std::string target_dir(dest_path); - if (dest_path.back() != '/') { - target_dir += '/'; - } - std::string prefix_path(zip_path); - if (!zip_path.empty() && zip_path.back() != '/') { - prefix_path += '/'; - } - const ZipString zip_prefix(prefix_path.c_str()); - - int ret = StartIteration(zip, &cookie, &zip_prefix, nullptr); - if (ret != 0) { - LOG(ERROR) << "failed to start iterating zip entries."; - return false; - } - - std::unique_ptr guard(cookie, EndIteration); - ZipEntry entry; - ZipString name; - int extractCount = 0; - while (Next(cookie, &entry, &name) == 0) { - std::string entry_name(name.name, name.name + name.name_length); - CHECK_LE(prefix_path.size(), entry_name.size()); - std::string path = target_dir + entry_name.substr(prefix_path.size()); - // Skip dir. - if (path.back() == '/') { - continue; - } - - if (dirCreateHierarchy(path.c_str(), UNZIP_DIRMODE, timestamp, true, sehnd) != 0) { - LOG(ERROR) << "failed to create dir for " << path; - return false; - } - - char *secontext = NULL; - if (sehnd) { - selabel_lookup(sehnd, &secontext, path.c_str(), UNZIP_FILEMODE); - setfscreatecon(secontext); - } - android::base::unique_fd fd(open(path.c_str(), O_CREAT|O_WRONLY|O_TRUNC, UNZIP_FILEMODE)); - if (fd == -1) { - PLOG(ERROR) << "Can't create target file \"" << path << "\""; - return false; - } - if (secontext) { - freecon(secontext); - setfscreatecon(NULL); - } - - int err = ExtractEntryToFile(zip, &entry, fd); - if (err != 0) { - LOG(ERROR) << "Error extracting \"" << path << "\" : " << ErrorCodeString(err); - return false; - } - - if (fsync(fd) != 0) { - PLOG(ERROR) << "Error syncing file descriptor when extracting \"" << path << "\""; - return false; - } - - if (timestamp != nullptr && utime(path.c_str(), timestamp)) { - PLOG(ERROR) << "Error touching \"" << path << "\""; - return false; - } - - LOG(INFO) << "Extracted file \"" << path << "\""; - ++extractCount; - } - - LOG(INFO) << "Extracted " << extractCount << " file(s)"; - return true; -} diff --git a/otautil/ZipUtil.h b/otautil/ZipUtil.h deleted file mode 100644 index cda405c2a..000000000 --- a/otautil/ZipUtil.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _OTAUTIL_ZIPUTIL_H -#define _OTAUTIL_ZIPUTIL_H - -#include - -#include - -#include -#include - -/* - * Inflate all files under zip_path to the directory specified by - * dest_path, which must exist and be a writable directory. The zip_path - * is allowed to be an empty string, in which case the whole package - * will be extracted. - * - * Directory entries are not extracted. - * - * The immediate children of zip_path will become the immediate - * children of dest_path; e.g., if the archive contains the entries - * - * a/b/c/one - * a/b/c/two - * a/b/c/d/three - * - * and ExtractPackageRecursive(a, "a/b/c", "/tmp", ...) is called, the resulting - * files will be - * - * /tmp/one - * /tmp/two - * /tmp/d/three - * - * If timestamp is non-NULL, file timestamps will be set accordingly. - * - * Returns true on success, false on failure. - */ -bool ExtractPackageRecursive(ZipArchiveHandle zip, const std::string& zip_path, - const std::string& dest_path, const struct utimbuf* timestamp, - struct selabel_handle* sehnd); - -#endif // _OTAUTIL_ZIPUTIL_H -- cgit v1.2.3