701 I161 (CppMicroServices#1097 ) (CppMicroServices#1169)

* I161 (CppMicroServices#1097)

Fixes CppMicroServices#161

* found spots to modify.

* issue 161.2 coded.

* fixed a logic error in issue 161.2

* Added a "-Wno-missing-template-arg-list-after-template-kw"

With apple's latest clang implementation, this warning fired as an error when including
boost::nowide. Turn the warning off.

* Issue 161.3: Early check for absolute path

when adding resource files.

* i161.3: Alternate code for mingw. std::filesystem not compatible.

---------

Co-authored-by: Michael Carney <carney@macmini.mynetworksettings.com>

* adapt for C++14

---------

Co-authored-by: carneyweb <mike@carneyweb.com>
Co-authored-by: Michael Carney <carney@macmini.mynetworksettings.com>

Author: 3 people

CMakeLists.txt

@@ -178,6 +178,11 @@ if (US_COMPILER_CLANG OR US_COMPILER_APPLE_CLANG)
   if (HAS_MISSING_BRACES_FLAG)
     add_compile_options(-Wno-missing-braces)
   endif()
+  
+  check_cxx_compiler_flag(-Wno-missing-template-arg-list-after-template-kw HAS_MISSING_TEMPLATE_KW_FLAG)
+  if (HAS_MISSING_TEMPLATE_KW_FLAG)
+    add_compile_options(-Wno-missing-template-arg-list-after-template-kw)
+  endif()
 endif()
 
 if(US_BUILD_TESTING)

tools/rc/ResourceCompiler.cpp

@@ -37,6 +37,10 @@
 #include <utility>
 #include <vector>
 
+#ifdef __MINGW32__
+#include <Shlwapi.h>
+#endif
+
 #include <nowide/args.hpp>
 #include <nowide/fstream.hpp>
 
@@ -415,6 +419,7 @@ ZipArchive::AddManifestFile(Json::Value const& manifest)
     std::string styledManifestJson(manifest.toStyledString());
     std::string archiveEntry(bundleName + "/manifest.json");
 
+    // Issue 161.1: Check for file exists first and throw a more desriptive runtime error
     CheckAndAddToArchivedNames(archiveEntry);
 
     if (MZ_FALSE
@@ -434,6 +439,19 @@ ZipArchive::AddResourceFile(std::string const& resFileName, bool isManifest)
 {
     std::string archiveName = resFileName;
 
+    bool pathToResIsAbsolute = false;
+
+#ifndef __MINGW32__
+    // Issue 161.3: check to see if resFileName is relative or not, and exit early if it is not.
+    pathToResIsAbsolute = resFileName[0] == '/';
+#else
+    pathToResIsAbsolute = !PathIsRelativeA(resFileName.c_str());
+#endif
+    
+    if (pathToResIsAbsolute) {
+        throw std::runtime_error("Relatvie path to resource file required. " + resFileName + " is absolute");
+    }
+
     // This check exists solely to maintain a deprecated way of adding manifest.json
     // through the --res-add option.
     if (isManifest || resFileName == std::string("manifest.json"))
@@ -534,7 +552,9 @@ ZipArchive::AddResourcesFromArchive(std::string const& archiveFileName)
         {
             if (numBytes > 1)
             {
-                if (archiveName[numBytes - 2] != '/') // The last character is '\0' in the array
+                // Issue 161.2: change to use mz_zip_read_is_file_a_directory() instead of checking
+                // for the format of the string.
+                if (MZ_FALSE == mz_zip_reader_is_file_a_directory(&currZipArchive, currZipIndex))
                 {
                     if (!archivedNames.insert(archiveName).second)
                     {