diff options
Diffstat (limited to 'updater/install.cpp')
| -rw-r--r-- | updater/install.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index 02a6fe7c5..d0be955a7 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -742,7 +742,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()); @@ -754,13 +754,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(""); } |