ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-02-03 16:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_archive_win_le' into 'master'

Browse Source 
fix loading windows line ending files in textarchive

See merge request ngsolve/netgen!550
This commit is contained in:
Schöberl, Joachim 2023-01-19 17:57:15 +01:00
commit 4710d94fb7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/core/archive.hpp
View File

@ -987,6 +987,8 @@ namespace ngcore
*stream >> len; *stream >> len;
char ch; char ch;
stream->get(ch); // '\n' stream->get(ch); // '\n'
if(ch == '\r') // windows line endings -> read \n as well
stream->get(ch);
str.resize(len); str.resize(len);
if(len) if(len)
stream->get(&str[0], len+1, '\0'); stream->get(&str[0], len+1, '\0');
@ -1006,6 +1008,8 @@ namespace ngcore
if(len) if(len)
{ {
stream->get(ch); // \n stream->get(ch); // \n
if(ch == '\r') // windows line endings, read \n as well
stream->get(ch);
stream->get(&str[0], len+1, '\0'); // NOLINT stream->get(&str[0], len+1, '\0'); // NOLINT
} }
str[len] = '\0'; // NOLINT str[len] = '\0'; // NOLINT