APPDATA should have been PROGRAMDATA

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

diff --git a/xmltooling/util/PathResolver.cpp b/xmltooling/util/PathResolver.cpp
index e241b14..6ed251e 100644 (file)
--- a/xmltooling/util/PathResolver.cpp
+++ b/xmltooling/util/PathResolver.cpp
@@ -38,6 +38,7 @@ PathResolver::PathResolver() : m_defaultPackage(PACKAGE_NAME), m_defaultPrefix("
     setXMLDir("/usr/share/xml");
     setRunDir("/var/run");
     setCfgDir("/etc");
+    setCacheDir("/var/cache");
 }
 
 PathResolver::~PathResolver()
@@ -79,6 +80,11 @@ void PathResolver::setCfgDir(const char* dir)
     m_cfg = dir;
 }
 
+void PathResolver::setCacheDir(const char* dir)
+{
+    m_cache = dir;
+}
+
 bool PathResolver::isAbsolute(const char* s) const
 {
     switch (*s) {
@@ -95,6 +101,20 @@ 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) {
+        // This is an ugly workaround for Windows XP/2003, which don't support the PROGRAMDATA variable.
+        if (!getenv("PROGRAMDATA") && s.find("%PROGRAMDATA%") != string::npos) {
+            s.replace(s.find("%PROGRAMDATA%"), 9, "%ALLUSERSPROFILE%/Application Data");
+        }
+        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:
@@ -139,6 +159,16 @@ const string& PathResolver::resolve(string& s, file_type_t filetype, const char*
                 }
                 break;
 
+            case XMLTOOLING_CACHE_FILE:
+                s = m_cache + '/' + (pkgname ? pkgname : m_defaultPackage) + '/' + s;
+                if (!isAbsolute(m_cache.c_str())) {
+                    if (prefix || m_defaultPrefix != "/usr")
+                        s = string(prefix ? prefix : m_defaultPrefix) + '/' + s;
+                    else
+                        s = string("/") + s;
+                }
+                break;
+
             default:
                 throw XMLToolingException("Unknown file type to resolve.");
         }