summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Runge <mrunge@google.com>2013-12-20 19:33:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-12-20 19:33:05 +0000
commitf9dd42de6034ab09f9fa649ed1fbea25bc05e598 (patch)
treeb58cc822d09668b8621238c87a59b31704be145c
parent168724c31ad5241e157ebb35135a734fa075d53b (diff)
parent6eed2247714967eb0ce913d7da782fa884a4c1bd (diff)
downloadbootable_recovery-f9dd42de6034ab09f9fa649ed1fbea25bc05e598.zip
bootable_recovery-f9dd42de6034ab09f9fa649ed1fbea25bc05e598.tar.gz
bootable_recovery-f9dd42de6034ab09f9fa649ed1fbea25bc05e598.tar.bz2
Merge "Don't abort on read_file if the file is missing." into klp-dev
-rw-r--r--updater/install.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/updater/install.c b/updater/install.c
index 9f299f6..b6852b0 100644
--- a/updater/install.c
+++ b/updater/install.c
@@ -1353,7 +1353,6 @@ Value* Sha1CheckFn(const char* name, State* state, int argc, Expr* argv[]) {
}
if (args[0]->size < 0) {
- printf("%s(): no file contents received", name);
return StringValue(strdup(""));
}
uint8_t digest[SHA_DIGEST_SIZE];
@@ -1406,12 +1405,11 @@ Value* ReadFileFn(const char* name, State* state, int argc, Expr* argv[]) {
FileContents fc;
if (LoadFileContents(filename, &fc, RETOUCH_DONT_MASK) != 0) {
- ErrorAbort(state, "%s() loading \"%s\" failed: %s",
- name, filename, strerror(errno));
free(filename);
- free(v);
+ v->size = -1;
+ v->data = NULL;
free(fc.data);
- return NULL;
+ return v;
}
v->size = fc.size;