From 6eed2247714967eb0ce913d7da782fa884a4c1bd Mon Sep 17 00:00:00 2001 From: Michael Runge Date: Fri, 13 Dec 2013 17:13:11 -0800 Subject: Don't abort on read_file if the file is missing. Change-Id: I85726bf736203d602428114145c3b98692580656 --- updater/install.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/updater/install.c b/updater/install.c index 9f299f6cc..b6852b0c7 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; -- cgit v1.2.3