From f6d00c059fb2a55946ba0d5ef38b91e8f7e1b265 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Mon, 13 Jan 2020 14:22:46 -0800 Subject: [PATCH] [util] Fix readLineFromFile on Cygwin --- programs/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/util.c b/programs/util.c index 399507c2a..4a3a37660 100644 --- a/programs/util.c +++ b/programs/util.c @@ -278,7 +278,9 @@ U64 UTIL_getTotalFileSize(const char* const * fileNamesTable, unsigned nbFiles) static size_t readLineFromFile(char* buf, size_t len, FILE* file) { assert(!feof(file)); - CONTROL( fgets(buf, (int) len, file) == buf ); /* requires success */ + /* Work around Cygwin problem when len == 1 it returns NULL. */ + if (len <= 1) return 0; + CONTROL( fgets(buf, (int) len, file) ); { size_t linelen = strlen(buf); if (strlen(buf)==0) return 0; if (buf[linelen-1] == '\n') linelen--; -- 2.47.2