From: Michael Heimpold <mhei@heimpold.de>
Date: Sat, 24 Nov 2018 09:22:53 +0000 (+0100)
Subject: fstools: guard usage of WEXITSTATUS
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=091aa3d72dcbbfdb4795bb17e260e35a635b0bf5;p=oweals%2Ffstools.git

fstools: guard usage of WEXITSTATUS

According to man page, using WEXITSTATUS should be guarded by a check
of WIFEXITED, so add this check.

While at, also print an error message in case fsck was terminated
by a signal.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/block.c b/block.c
index 2e3841a..07719a3 100644
--- a/block.c
+++ b/block.c
@@ -757,8 +757,10 @@ static void check_filesystem(struct probe_info *pr)
 		int status;
 
 		waitpid(pid, &status, 0);
-		if (WEXITSTATUS(status))
+		if (WIFEXITED(status) && WEXITSTATUS(status))
 			ULOG_ERR("check_filesystem: %s returned %d\n", ckfs, WEXITSTATUS(status));
+		if (WIFSIGNALED(status))
+			ULOG_ERR("check_filesystem: %s terminated by %s\n", ckfs, strsignal(WTERMSIG(status)));
 	}
 }