PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "updater: Let read_file() return Value::Type::STRING."

Browse Source 
am: ac234b4493

Change-Id: Ia5cc991c7b1d8800aa211349eeb3f8676a056191
This commit is contained in:
Tao Bao
2018-07-10 12:38:22 -07:00
committed by android-build-merger
parent 17cda674f3 ac234b4493
commit e089c1a149
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/install.cpp
+5 -5
View File
@@ -740,7 +740,7 @@ Value* RunProgramFn(const char* name, State* state, const std::vector<std::uniqu
}
// read_file(filename)
// Reads a local file 'filename' and returns its contents as a Value string.
// Reads a local file 'filename' and returns its contents as a string Value.
Value* ReadFileFn(const char* name, State* state, const std::vector<std::unique_ptr<Expr>>& argv) {
if (argv.size() != 1) {
return ErrorAbort(state, kArgsParsingFailure, "%s() expects 1 arg, got %zu", name, argv.size());
@@ -752,13 +752,13 @@ Value* ReadFileFn(const char* name, State* state, const std::vector<std::unique_
}
const std::string& filename = args[0];
FileContents fc;
if (LoadFileContents(filename.c_str(), &fc) == 0) {
return new Value(Value::Type::BLOB, std::string(fc.data.cbegin(), fc.data.cend()));
std::string contents;
if (android::base::ReadFileToString(filename, &contents)) {
return new Value(Value::Type::STRING, std::move(contents));
}
// Leave it to caller to handle the failure.
LOG(ERROR) << name << ": Failed to read " << filename;
PLOG(ERROR) << name << ": Failed to read " << filename;
return StringValue("");
}