diff options
author | Tao Bao <tbao@google.com> | 2016-11-18 01:57:14 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-18 01:57:14 +0100 |
commit | 29dc892c07a148bb26544f325d3a4f86ee8810ae (patch) | |
tree | 5a85c32871734985d2c4a0b680695c1d53f11e8b | |
parent | Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df (diff) | |
parent | Merge "updater: Add "write_value()" function." (diff) | |
download | android_bootable_recovery-29dc892c07a148bb26544f325d3a4f86ee8810ae.tar android_bootable_recovery-29dc892c07a148bb26544f325d3a4f86ee8810ae.tar.gz android_bootable_recovery-29dc892c07a148bb26544f325d3a4f86ee8810ae.tar.bz2 android_bootable_recovery-29dc892c07a148bb26544f325d3a4f86ee8810ae.tar.lz android_bootable_recovery-29dc892c07a148bb26544f325d3a4f86ee8810ae.tar.xz android_bootable_recovery-29dc892c07a148bb26544f325d3a4f86ee8810ae.tar.zst android_bootable_recovery-29dc892c07a148bb26544f325d3a4f86ee8810ae.zip |
-rw-r--r-- | tests/component/updater_test.cpp | 33 | ||||
-rw-r--r-- | updater/install.cpp | 34 |
2 files changed, 64 insertions, 3 deletions
diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp index a029cf449..d34c0e54c 100644 --- a/tests/component/updater_test.cpp +++ b/tests/component/updater_test.cpp @@ -322,3 +322,36 @@ TEST_F(UpdaterTest, package_extract_file) { CloseArchive(handle); } + +TEST_F(UpdaterTest, write_value) { + // write_value() expects two arguments. + expect(nullptr, "write_value()", kArgsParsingFailure); + expect(nullptr, "write_value(\"arg1\")", kArgsParsingFailure); + expect(nullptr, "write_value(\"arg1\", \"arg2\", \"arg3\")", kArgsParsingFailure); + + // filename cannot be empty. + expect(nullptr, "write_value(\"value\", \"\")", kArgsParsingFailure); + + // Write some value to file. + TemporaryFile temp_file; + std::string value = "magicvalue"; + std::string script("write_value(\"" + value + "\", \"" + std::string(temp_file.path) + "\")"); + expect("t", script.c_str(), kNoCause); + + // Verify the content. + std::string content; + ASSERT_TRUE(android::base::ReadFileToString(temp_file.path, &content)); + ASSERT_EQ(value, content); + + // Allow writing empty string. + script = "write_value(\"\", \"" + std::string(temp_file.path) + "\")"; + expect("t", script.c_str(), kNoCause); + + // Verify the content. + ASSERT_TRUE(android::base::ReadFileToString(temp_file.path, &content)); + ASSERT_EQ("", content); + + // It should fail gracefully when write fails. + script = "write_value(\"value\", \"/proc/0/file1\")"; + expect("", script.c_str(), kNoCause); +} diff --git a/updater/install.cpp b/updater/install.cpp index b885f864e..da68420e8 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -39,11 +39,12 @@ #include <string> #include <vector> -#include <android-base/parseint.h> +#include <android-base/file.h> #include <android-base/parsedouble.h> +#include <android-base/parseint.h> #include <android-base/properties.h> -#include <android-base/strings.h> #include <android-base/stringprintf.h> +#include <android-base/strings.h> #include <cutils/android_reboot.h> #include <ext4_utils/make_ext4fs.h> #include <ext4_utils/wipe.h> @@ -861,7 +862,6 @@ Value* GetPropFn(const char* name, State* state, int argc, Expr* argv[]) { return StringValue(value); } - // file_getprop(file, key) // // interprets 'file' as a getprop-style file (key=value pairs, one @@ -1155,6 +1155,33 @@ Value* ReadFileFn(const char* name, State* state, int argc, Expr* argv[]) { return v; } +// write_value(value, filename) +// Writes 'value' to 'filename'. +// Example: write_value("960000", "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq") +Value* WriteValueFn(const char* name, State* state, int argc, Expr* argv[]) { + if (argc != 2) { + return ErrorAbort(state, kArgsParsingFailure, "%s() expects 2 args, got %d", name, argc); + } + + std::vector<std::string> args; + if (!ReadArgs(state, 2, argv, &args)) { + return ErrorAbort(state, kArgsParsingFailure, "%s(): Failed to parse the argument(s)", name); + } + + const std::string& filename = args[1]; + if (filename.empty()) { + return ErrorAbort(state, kArgsParsingFailure, "%s(): Filename cannot be empty", name); + } + + const std::string& value = args[0]; + if (!android::base::WriteStringToFile(value, filename)) { + printf("%s: Failed to write to \"%s\": %s\n", name, filename.c_str(), strerror(errno)); + return StringValue(""); + } else { + return StringValue("t"); + } +} + // Immediately reboot the device. Recovery is not finished normally, // so if you reboot into recovery it will re-start applying the // current package (because nothing has cleared the copy of the @@ -1363,6 +1390,7 @@ void RegisterInstallFunctions() { RegisterFunction("read_file", ReadFileFn); RegisterFunction("sha1_check", Sha1CheckFn); RegisterFunction("rename", RenameFn); + RegisterFunction("write_value", WriteValueFn); RegisterFunction("wipe_cache", WipeCacheFn); |