From: Paul Spooren <mail@aparcar.org>
Date: Fri, 17 Jul 2020 08:19:31 +0000 (-1000)
Subject: scripts: mkhash fix return code handling
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=fac98f1c54a16073e28ab11adf195f9917a30ef6;p=openwrt%2Fstaging%2Fjow.git

scripts: mkhash fix return code handling

If hashing a file fails mkhash shouldn't just silently fail. Now check
after each call of `hash_file()` the return and exit early in case of
errors. The return value which was previously ignored and would always
return 0.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/scripts/mkhash.c b/scripts/mkhash.c
index e26ca3a350..ce156e979d 100644
--- a/scripts/mkhash.c
+++ b/scripts/mkhash.c
@@ -823,8 +823,11 @@ int main(int argc, char **argv)
 	if (argc < 2)
 		return hash_file(t, NULL, add_filename);
 
-	for (i = 0; i < argc - 1; i++)
-		hash_file(t, argv[1 + i], add_filename);
+	for (i = 0; i < argc - 1; i++) {
+		int ret = hash_file(t, argv[1 + i], add_filename);
+		if (ret)
+			return ret;
+	}
 
 	return 0;
 }