Bring back file-based OTA edify functions (c3045007) · Commits · e / os / android_bootable_recovery

edify/include/edify/updater_runtime_interface.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		#include <string_view>
		#include <vector>

		struct selabel_handle;

		// This class serves as the base to updater runtime. It wraps the runtime dependent functions; and
		// updates on device and host simulations can have different implementations. e.g. block devices
		// during host simulation merely a temporary file. With this class, the caller side in registered
		@@ -74,4 +76,8 @@ class UpdaterRuntimeInterface {

		// On devices supports A/B, add current slot suffix to arg. Otherwise, return \|arg\| as is.
		virtual std::string AddSlotSuffix(const std::string_view arg) const = 0;

		virtual struct selabel_handle* sehandle() const {
		return nullptr;
		}
		};

otautil/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,12 +29,14 @@ cc_library_static {
		"paths.cpp",
		"rangeset.cpp",
		"sysutil.cpp",
		"ziputil.cpp",
		],

		shared_libs: [
		"libbase",
		"libcutils",
		"libselinux",
		"libziparchive",
		],

		export_include_dirs: [

otautil/dirutil.cpp

+62 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,11 @@ static DirStatus dir_status(const std::string& path) {

		int mkdir_recursively(const std::string& input_path, mode_t mode, bool strip_filename,
		const selabel_handle* sehnd) {
		return mkdir_recursively(input_path, mode, strip_filename, sehnd, NULL);
		}

		int mkdir_recursively(const std::string& input_path, mode_t mode, bool strip_filename,
		const selabel_handle* sehnd, const struct utimbuf* timestamp) {
		// Check for an empty string before we bother making any syscalls.
		if (input_path.empty()) {
		errno = ENOENT;
		@@ -104,6 +109,9 @@ int mkdir_recursively(const std::string& input_path, mode_t mode, bool strip_fil
		if (err != 0) {
		return -1;
		}
		if (timestamp != NULL && utime(dir_path.c_str(), timestamp)) {
		return -1;
		}
		break;
		}
		default:
		@@ -114,3 +122,57 @@ int mkdir_recursively(const std::string& input_path, mode_t mode, bool strip_fil
		}
		return 0;
		}

		int dirUnlinkHierarchy(const char* path) {
		struct stat st;
		DIR* dir;
		struct dirent* de;
		int fail = 0;

		/* is it a file or directory? */
		if (lstat(path, &st) < 0) {
		return -1;
		}

		/* a file, so unlink it */
		if (!S_ISDIR(st.st_mode)) {
		return unlink(path);
		}

		/* a directory, so open handle */
		dir = opendir(path);
		if (dir == NULL) {
		return -1;
		}

		/* recurse over components */
		errno = 0;
		while ((de = readdir(dir)) != NULL) {
		// TODO: don't blow the stack
		char dn[PATH_MAX];
		if (!strcmp(de->d_name, "..") \|\| !strcmp(de->d_name, ".")) {
		continue;
		}
		snprintf(dn, sizeof(dn), "%s/%s", path, de->d_name);
		if (dirUnlinkHierarchy(dn) < 0) {
		fail = 1;
		break;
		}
		errno = 0;
		}
		/* in case readdir or unlink_recursive failed */
		if (fail \|\| errno < 0) {
		int save = errno;
		closedir(dir);
		errno = save;
		return -1;
		}

		/* close directory handle */
		if (closedir(dir) < 0) {
		return -1;
		}

		/* delete target directory */
		return rmdir(path);
		}

otautil/include/otautil/dirutil.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@
		#ifndef OTAUTIL_DIRUTIL_H_
		#define OTAUTIL_DIRUTIL_H_

		#include <limits.h> // PATH_MAX
		#include <sys/stat.h> // mode_t
		#include <utime.h> // utime/utimbuf

		#include <string>

		@@ -36,4 +38,11 @@ struct selabel_handle;
		int mkdir_recursively(const std::string& path, mode_t mode, bool strip_filename,
		const struct selabel_handle* sehnd);

		// As above, but if timestamp is non-NULL, directories will be timestamped accordingly.
		int mkdir_recursively(const std::string& input_path, mode_t mode, bool strip_filename,
		const selabel_handle* sehnd, const struct utimbuf* timestamp);

		// rm -rf <path>
		int dirUnlinkHierarchy(const char* path);

		#endif // OTAUTIL_DIRUTIL_H_

otautil/include/otautil/ziputil.h

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* 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 <utime.h>

		#include <string>

		#include <selinux/label.h>
		#include <ziparchive/zip_archive.h>

		/*
		* 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