From 10c0566121cb923b7f4e6c1a97a1df8ad70cb327 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 19 Jan 2021 11:43:50 -0500
Subject: Don't keep temporary C build files by default.

---
 tools/preproc/c_file.cpp | 54 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 13 deletions(-)

(limited to 'tools/preproc/c_file.cpp')

diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp
index b996a048c..f7ca4365c 100644
--- a/tools/preproc/c_file.cpp
+++ b/tools/preproc/c_file.cpp
@@ -23,32 +23,58 @@
 #include <stdexcept>
 #include <string>
 #include <memory>
+#include <cstring>
 #include "preproc.h"
 #include "c_file.h"
 #include "char_util.h"
 #include "utf8.h"
 #include "string_parser.h"
 
-CFile::CFile(std::string filename) : m_filename(filename)
+CFile::CFile(const char * filenameCStr, bool isStdin)
 {
-    FILE *fp = std::fopen(filename.c_str(), "rb");
+    FILE *fp;
+
+    if (isStdin) {
+        fp = stdin;
+        m_filename = std::string{"<stdin>/"}.append(filenameCStr);
+    } else {
+        fp = std::fopen(filenameCStr, "rb");
+        m_filename = std::string(filenameCStr);
+    }
+
+    std::string& filename = m_filename;
 
     if (fp == NULL)
         FATAL_ERROR("Failed to open \"%s\" for reading.\n", filename.c_str());
 
-    std::fseek(fp, 0, SEEK_END);
-
-    m_size = std::ftell(fp);
+    m_size = 0;
+    m_buffer = (char *)malloc(CHUNK_SIZE + 1);
+    if (m_buffer == NULL) {
+        FATAL_ERROR("Failed to allocate memory to process file \"%s\"!", filename.c_str());
+    }
 
-    if (m_size < 0)
-        FATAL_ERROR("File size of \"%s\" is less than zero.\n", filename.c_str());
+    std::size_t numAllocatedBytes = CHUNK_SIZE + 1;
+    std::size_t bufferOffset = 0;
+    std::size_t count;
 
-    m_buffer = new char[m_size + 1];
+    while ((count = std::fread(m_buffer + bufferOffset, 1, CHUNK_SIZE, fp)) != 0) {
+        if (!std::ferror(fp)) {
+            m_size += count;
 
-    std::rewind(fp);
+            if (std::feof(fp)) {
+                break;
+            }
 
-    if (std::fread(m_buffer, m_size, 1, fp) != 1)
-        FATAL_ERROR("Failed to read \"%s\".\n", filename.c_str());
+            numAllocatedBytes += CHUNK_SIZE;
+            bufferOffset += CHUNK_SIZE;
+            m_buffer = (char *)realloc(m_buffer, numAllocatedBytes);
+            if (m_buffer == NULL) {
+                FATAL_ERROR("Failed to allocate memory to process file \"%s\"!", filename.c_str());
+            }
+        } else {
+            FATAL_ERROR("Failed to read \"%s\". (error: %s)", filename.c_str(), std::strerror(errno));
+        }
+    }
 
     m_buffer[m_size] = 0;
 
@@ -56,6 +82,7 @@ CFile::CFile(std::string filename) : m_filename(filename)
 
     m_pos = 0;
     m_lineNum = 1;
+    m_isStdin = isStdin;
 }
 
 CFile::CFile(CFile&& other) : m_filename(std::move(other.m_filename))
@@ -64,13 +91,14 @@ CFile::CFile(CFile&& other) : m_filename(std::move(other.m_filename))
     m_pos = other.m_pos;
     m_size = other.m_size;
     m_lineNum = other.m_lineNum;
+    m_isStdin = other.m_isStdin;
 
-    other.m_buffer = nullptr;
+    other.m_buffer = NULL;
 }
 
 CFile::~CFile()
 {
-    delete[] m_buffer;
+    free(m_buffer);
 }
 
 void CFile::Preproc()
-- 
cgit v1.2.3


From 7189e4e26f3da36ed9d373f77a9f51a36fc8ddaf Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Thu, 3 Jun 2021 21:05:56 -0400
Subject: Fix build on macos.

Needs <cerrno> include in tools/preproc/c_file.cpp
---
 tools/preproc/c_file.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools/preproc/c_file.cpp')

diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp
index f7ca4365c..17a08cc9f 100644
--- a/tools/preproc/c_file.cpp
+++ b/tools/preproc/c_file.cpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <memory>
 #include <cstring>
+#include <cerrno>
 #include "preproc.h"
 #include "c_file.h"
 #include "char_util.h"
-- 
cgit v1.2.3