Add path resolution and env expansion to catalog path.

[shibboleth/cpp-xmltooling.git] / xmltooling / util / PathResolver.cpp

diff --git a/xmltooling/util/PathResolver.cpp b/xmltooling/util/PathResolver.cpp
index 0277e0b..4ca48ec 100644 (file)
--- a/xmltooling/util/PathResolver.cpp
+++ b/xmltooling/util/PathResolver.cpp
@@ -101,6 +101,16 @@ bool PathResolver::isAbsolute(const char* s) const
 
 const string& PathResolver::resolve(string& s, file_type_t filetype, const char* pkgname, const char* prefix) const
 {
+#ifdef WIN32
+    // Check for possible environment variable(s).
+    if (s.find('%') != string::npos) {
+        char expbuf[MAX_PATH + 2];
+        DWORD cnt = ExpandEnvironmentStrings(s.c_str(), expbuf, sizeof(expbuf));
+        if (cnt != 0 && cnt <= sizeof(expbuf))
+            s = expbuf;
+    }
+#endif
+
     if (!isAbsolute(s.c_str())) {
         switch (filetype) {
             case XMLTOOLING_LIB_FILE: