mst: add compile-time flag for INCLUDE

kgadek · Apr 17, 2022 · 88b640d · 88b640d
1 parent 409e7ad
commit 88b640d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,9 +14,13 @@ add_subdirectory(mstch)
 include_directories(${mstch_INCLUDE_DIR})
 
 option(WITH_CMD "Allow running arbitrary commands via templates" ON)
+option(WITH_INCLUDE "Allow including arbitrary files via templates" ON)
 if(WITH_CMD)
     add_definitions(-DMST_WITH_CMD)
 endif()
+if(WITH_INCLUDE)
+    add_definitions(-DMST_WITH_INCLUDE)
+endif()
 
 set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-format-style=file;-checks=*,-llvmlibc-restrict-system-libc-headers,-llvmlibc-implementation-in-namespace,-llvmlibc-callee-namespace,-fuchsia-default-arguments-calls,-modernize-use-trailing-return-type")
 add_executable(mst mst.cxx)

diff --git a/README.rst b/README.rst
@@ -8,8 +8,8 @@ A rather small CLI file templating tool written in C++. Specifically designed to
 Standing on a shoulders of a wonderful `no1msd/mstch <https://github.com/no1msd/mstch>`_ library.
 
    **Warning ⚠️**: ``mst`` assumes input is trusted. By design, it **will run arbitrary commands**
-   specified in templates with ``{{#cmd}}ls -alh *{{/cmd}}`` syntax. This feature can be disabled
-   by a compile-time flag: ``cmake -DWITH_CMD=OFF ...``.
+   and **read arbitrary files** as instructed by input file. These features can be disabled
+   by compile-time flags: ``cmake -DWITH_CMD=OFF -DWITH_INCLUDE=OFF ...``.
 
 .. highlight:: bash
 .. code-block:: console
@@ -18,11 +18,11 @@ Standing on a shoulders of a wonderful `no1msd/mstch <https://github.com/no1msd/
    ===============================================================================
     Language            Files        Lines         Code     Comments       Blanks
    ===============================================================================
-    CMake                   1           25           16            3            6
-    C++                     1           65           56            6            3
+    CMake                   1           29           20            3            6
+    C++                     1           68           59            6            3
     ReStructuredText        1           51           36            0           15
    ===============================================================================
-    Total                   3          141          108            9           24
+    Total                   3          148          115            9           24
    ===============================================================================
 
 Notes

diff --git a/mst.cxx b/mst.cxx
@@ -25,30 +25,33 @@ int main(int argc, char* argv[]) {
     mstch::config::escape = [](const string& str) -> string { return str; };
     ifstream template_file{argv[1]};
     string template_content{istreambuf_iterator<char>{template_file}, istreambuf_iterator<char>{}};
-    mstch::map ctx{{"include", mstch::lambda{[](const string& filename) -> mstch::node {
-                      ifstream file_fstream{filename};
-                      if ((file_fstream.rdstate() & ifstream::failbit) != 0) {
-                        throw runtime_error("Can't open file: " + filename);
-                      }
-                      return string{istreambuf_iterator<char>{file_fstream}, istreambuf_iterator<char>{}};
-                    }}},
+    mstch::map ctx{
+#ifdef MST_WITH_INCLUDE
+        {"include", mstch::lambda{[](const string& filename) -> mstch::node {
+           ifstream file_fstream{filename};
+           if ((file_fstream.rdstate() & ifstream::failbit) != 0) {
+             throw runtime_error("Can't open file: " + filename);
+           }
+           return string{istreambuf_iterator<char>{file_fstream}, istreambuf_iterator<char>{}};
+         }}},
+#endif
 #ifdef MST_WITH_CMD
-                   {"cmd", mstch::lambda{[](const string& cmd) -> mstch::node {
-                      redi::ipstream cmd_stream(cmd);
-                      string stdout{istreambuf_iterator<char>{cmd_stream}, istreambuf_iterator<char>{}};
-                      cmd_stream.close();
-                      if (int exitcode = cmd_stream.rdbuf()->status(); cmd_stream.rdbuf()->exited() && exitcode != 0) {
-                        throw runtime_error("Exit status " + to_string(exitcode) + " of command: '" + cmd + "'");
-                      }
-                      return stdout;
-                    }}},
+        {"cmd", mstch::lambda{[](const string& cmd) -> mstch::node {
+           redi::ipstream cmd_stream(cmd);
+           string stdout{istreambuf_iterator<char>{cmd_stream}, istreambuf_iterator<char>{}};
+           cmd_stream.close();
+           if (int exitcode = cmd_stream.rdbuf()->status(); cmd_stream.rdbuf()->exited() && exitcode != 0) {
+             throw runtime_error("Exit status " + to_string(exitcode) + " of command: '" + cmd + "'");
+           }
+           return stdout;
+         }}},
 #endif
-                   {"env", mstch::lambda{[](const string& env_var_name) -> mstch::node {
-                      if (char* env_var_value = getenv(env_var_name.c_str())) {
-                        return string{env_var_value};
-                      }
-                      throw runtime_error("Env var doesn't exist: " + env_var_name);
-                    }}}};
+        {"env", mstch::lambda{[](const string& env_var_name) -> mstch::node {
+           if (char* env_var_value = getenv(env_var_name.c_str())) {
+             return string{env_var_value};
+           }
+           throw runtime_error("Env var doesn't exist: " + env_var_name);
+         }}}};
 
     for (int i = 2; i + 1 < argc; i += 2) {
       ctx.emplace(make_pair(string(argv[i]), string(argv[i + 1])));