fixed reading of files with multi-byte characters in FileStream

danmar · Apr 19, 2022 · 1781870 · 1781870
1 parent f761852
commit 1781870
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -377,7 +377,9 @@ class FileStream : public simplecpp::TokenList::Stream {
     }
 
     virtual int get() {
-        lastCh = fgetc(file);
+        unsigned char ch;
+        const int res = fread(&ch, 1, 1, file);
+        lastCh = (res != 1 && feof(file)) ? EOF : ch;
         return lastCh;
     }
     virtual int peek() {
@@ -386,7 +388,7 @@ class FileStream : public simplecpp::TokenList::Stream {
         return ch;
     }
     virtual void unget() {
-        ungetc(lastCh, file);
+        fseek(file, -1, SEEK_CUR);
     }
     virtual bool good() {
         return lastCh != EOF;