From 27c1bc8dfb82f1ccab6bd9b4ce4f54e1fbf7bc3d Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sat, 3 Apr 2021 08:57:49 +0100 Subject: build system: avoid build failure during bisection Commit 4bdc914ff (build system: fix compiler warnings) added a test on the return value of fgets() in split-include.c. During bisection it's possible to go back to a state where a configuration value didn't exist. This results in an empty include file corresponding to the missing feature. If a subsequent bisection returns to a state where the feature exists split-include treats the empty file as an error and the build fails. Add a call to ferror() to distinguish between fgets() failing due to an error and due to there being no data to read. Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko --- scripts/basic/split-include.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/basic') diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c index 791d142..a38ac34 100644 --- a/scripts/basic/split-include.c +++ b/scripts/basic/split-include.c @@ -131,7 +131,7 @@ int main(int argc, const char * argv []) is_same = 0; if ((fp_target = fopen(ptarget, "r")) != NULL) { - if (!fgets(old_line, buffer_size, fp_target)) + if (!fgets(old_line, buffer_size, fp_target) && ferror(fp_target)) ERROR_EXIT(ptarget); if (fclose(fp_target) != 0) ERROR_EXIT(ptarget); -- cgit v1.1