From cfef21f5b0a5c4291dcaa019e287210064371edb Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 3 Sep 2022 08:51:17 +0200 Subject: diagnostics: Windows compatibility issues Suggested by Bruno Haible following a report from Andrei Malashkin * src/location.c (caret_set_file): Read the file in binary. We already deal with CRLF in caret_getc_internal. --- THANKS | 1 + src/location.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/THANKS b/THANKS index 391b847e..52092368 100644 --- a/THANKS +++ b/THANKS @@ -14,6 +14,7 @@ Alexandre Duret-Lutz adl@lrde.epita.fr Andre da Costa Barros andre.cbarros@yahoo.com Andreas Damm adamm@onica.com Andreas Schwab schwab@suse.de +Andrei Malashkin malashkin.andrey@gmail.com Andrew Suffield asuffield@users.sourceforge.net Angelo Borsotti angelo.borsotti@gmail.com Anthony Heading ajrh@ajrh.net diff --git a/src/location.c b/src/location.c index 94c77ef6..0f56bd39 100644 --- a/src/location.c +++ b/src/location.c @@ -268,13 +268,13 @@ caret_set_file (const char *file) if (!caret_info.pos.file) { caret_info.pos.file = file; - if ((caret_info.file = fopen (caret_info.pos.file, "r"))) + if ((caret_info.file = fopen (caret_info.pos.file, "rb"))) { /* If the file is not regular (imagine #line 1 "/dev/stdin" in the input file for instance), don't try to quote the - file. Keep caret_info.file set so that we don't try to - open it again, but leave caret_info.file NULL so that we - don't try to quote it. */ + file. Keep caret_info.pos.file set so that we don't try + to open it again, but leave caret_info.file NULL so that + we don't try to quote it. */ struct stat buf; if (fstat (fileno (caret_info.file), &buf) == 0 && buf.st_mode & S_IFREG) -- cgit v1.2.1