From: Yann Collet <cyan@fb.com>
Date: Thu, 6 May 2021 01:01:55 +0000 (-0700)
Subject: fix --filelist compatibility with Windows cr+lf line ending
X-Git-Tag: v1.5.0^2~27^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df05b2ba7c22b6b45ef4ccc133f6c71d49db65c0;p=thirdparty%2Fzstd.git

fix --filelist compatibility with Windows cr+lf line ending
---

diff --git a/programs/util.c b/programs/util.c
index ffda78665..8d190c62c 100644
--- a/programs/util.c
+++ b/programs/util.c
@@ -323,9 +323,7 @@ U64 UTIL_getTotalFileSize(const char* const * fileNamesTable, unsigned nbFiles)
 static size_t readLineFromFile(char* buf, size_t len, FILE* file)
 {
     assert(!feof(file));
-    /* Work around Cygwin problem when len == 1 it returns NULL. */
-    if (len <= 1) return 0;
-    CONTROL( fgets(buf, (int) len, file) );
+    if ( fgets(buf, (int) len, file) == NULL ) return 0;
     {   size_t linelen = strlen(buf);
         if (strlen(buf)==0) return 0;
         if (buf[linelen-1] == '\n') linelen--;