From dcc72e0bec2f07d2f91810362e98e39edc23c53f Mon Sep 17 00:00:00 2001
From: Lucjan Bryndza <lucjan.bryndza@mudita.com>
Date: Tue, 19 Jan 2021 19:14:02 +0100
Subject: [PATCH] [EGD-5332] Fix heap size and other merge fixes

After merge with master we are unable to run any application
It was caused by the insufficent heap size
---
 board/linux/libiosyscalls/src/iosyscalls.cpp  |  1 -
 .../model/QuotesRepository.hpp                |  7 ++++---
 module-os/FreeRTOS/include/FreeRTOSConfig.h   |  2 +-
 module-utils/bootconfig/src/bootconfig.cpp    | 19 +++++--------------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/board/linux/libiosyscalls/src/iosyscalls.cpp b/board/linux/libiosyscalls/src/iosyscalls.cpp
index 2677e179fca537028f361e8e6c40f2589e473e75..a16995ff330cf473327ed8830f5f3e3d0c90c874 100644
--- a/board/linux/libiosyscalls/src/iosyscalls.cpp
+++ b/board/linux/libiosyscalls/src/iosyscalls.cpp
@@ -21,7 +21,6 @@ namespace {
     constexpr const char * LINUX_PATHS[] {
         "/dev/",
         "/etc/",
-        "/sys/.boot.json",
         "/usr/share",
         "/run/user",
         "/home",
diff --git a/module-apps/application-settings-new/model/QuotesRepository.hpp b/module-apps/application-settings-new/model/QuotesRepository.hpp
index 15641b7dee6f4bd2af8410dd07c9fd1640321cbe..5ef8e4fa01ed66d58e3651ea1d34b0e45fd9c4b0 100644
--- a/module-apps/application-settings-new/model/QuotesRepository.hpp
+++ b/module-apps/application-settings-new/model/QuotesRepository.hpp
@@ -10,6 +10,7 @@
 
 #include <list>
 #include <functional>
+#include <filesystem>
 #include <module-apps/Application.hpp>
 
 namespace app
@@ -48,9 +49,9 @@ namespace app
         void remove(const QuoteRecord &quote) override;
 
       private:
-        void writeQuotes(const fs::path &path);
-        void readQuotes(const fs::path &fn);
-        std::string readFileToString(const fs::path &fn);
+        void writeQuotes(const std::filesystem::path &path);
+        void readQuotes(const std::filesystem::path &fn);
+        std::string readFileToString(const std::filesystem::path &fn);
 
         std::list<QuoteRecord> quotes;
         std::string repositoryPath;
diff --git a/module-os/FreeRTOS/include/FreeRTOSConfig.h b/module-os/FreeRTOS/include/FreeRTOSConfig.h
index 3310362d9e810400315c6f115236599b1ea80d9e..6cd258930bf2d5c15c1e31f081413d66d71a968f 100644
--- a/module-os/FreeRTOS/include/FreeRTOSConfig.h
+++ b/module-os/FreeRTOS/include/FreeRTOSConfig.h
@@ -80,7 +80,7 @@ extern uint32_t SystemCoreClock;
 #define configSUPPORT_STATIC_ALLOCATION         1
 #define configSUPPORT_DYNAMIC_ALLOCATION        1
 #ifdef TARGET_Linux
-#   define configTOTAL_HEAP_SIZE                   ((size_t)(1024*373))
+#   define configTOTAL_HEAP_SIZE                   ((size_t)(1024*512))
 #else
 #   define configTOTAL_HEAP_SIZE                   ((size_t)(1024*324))
 #endif
diff --git a/module-utils/bootconfig/src/bootconfig.cpp b/module-utils/bootconfig/src/bootconfig.cpp
index 27350ad7f2e11893cbb79a73ab0ea93edd7d4d62..70e9b3aa911b98ed8d73c93a6ffd3124ab7576f2 100644
--- a/module-utils/bootconfig/src/bootconfig.cpp
+++ b/module-utils/bootconfig/src/bootconfig.cpp
@@ -9,6 +9,7 @@
 #include <time/time_conversion.hpp>
 #include <ticks.hpp>
 #include <cstdio>
+#include <fstream>
 #include <log/log.hpp>
 #include <crc32/crc32.h>
 
@@ -101,20 +102,10 @@ namespace boot
         }
         std::string loadFileAsString(const std::filesystem::path &fileToLoad)
         {
-            auto lamb = [](::FILE *stream) { ::fclose(stream); };
-            std::unique_ptr<char[]> readBuf(new char[boot::consts::tar_buf]);
-            std::unique_ptr<::FILE, decltype(lamb)> fp(fopen(fileToLoad.c_str(), "r"), lamb);
-            std::string contents;
-            size_t readSize;
-
-            if (fp.get() != nullptr) {
-                while (!feof(fp.get())) {
-                    readSize = fread(readBuf.get(), 1, boot::consts::tar_buf, fp.get());
-                    contents.append(static_cast<const char *>(readBuf.get()), readSize);
-                }
-            }
-
-            return contents;
+            std::string content;
+            std::ifstream in(fileToLoad);
+            std::getline(in, content, std::string::traits_type::to_char_type(std::string::traits_type::eof()));
+            return content;
         }
 
     } // namespace