emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build system: avoid build failure during bisection

Browse Source 
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 <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2021-04-03 08:57:49 +01:00 committed by Denys Vlasenko
parent f0c0c56e9b
commit 27c1bc8dfb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/basic/split-include.c
View File

@ -131,7 +131,7 @@ int main(int argc, const char * argv [])
is_same = 0; is_same = 0;
if ((fp_target = fopen(ptarget, "r")) != NULL) 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); ERROR_EXIT(ptarget);
if (fclose(fp_target) != 0) if (fclose(fp_target) != 0)
ERROR_EXIT(ptarget); ERROR_EXIT(ptarget);