[openwrt/openwrt] scripts: mkhash fix return code handling

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 9 05:59:56 EST 2020


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/fac98f1c54a16073e28ab11adf195f9917a30ef6

commit fac98f1c54a16073e28ab11adf195f9917a30ef6
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Thu Jul 16 22:19:31 2020 -1000

    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 at aparcar.org>
---
 scripts/mkhash.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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;
 }



More information about the lede-commits mailing list