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 e25000f..6ed251e 100644 (file)
--- a/xmltooling/util/PathResolver.cpp
+++ b/xmltooling/util/PathResolver.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2009 Internet2
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -34,10 +38,83 @@ PathResolver::PathResolver() : m_defaultPackage(PACKAGE_NAME), m_defaultPrefix("
     setXMLDir("/usr/share/xml");
     setRunDir("/var/run");
     setCfgDir("/etc");
+    setCacheDir("/var/cache");
+}
+
+PathResolver::~PathResolver()
+{
+}
+
+void PathResolver::setDefaultPackageName(const char* pkgname)
+{
+    m_defaultPackage = pkgname;
+}
+
+void PathResolver::setDefaultPrefix(const char* prefix)
+{
+    m_defaultPrefix = prefix;
+}
+
+void PathResolver::setLibDir(const char* dir)
+{
+    m_lib = dir;
+}
+
+void PathResolver::setLogDir(const char* dir)
+{
+    m_log = dir;
+}
+
+void PathResolver::setXMLDir(const char* dir)
+{
+    m_xml = dir;
+}
+
+void PathResolver::setRunDir(const char* dir)
+{
+    m_run = dir;
+}
+
+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) {
+        case 0:
+            return false;
+        case '/':
+        case '\\':
+            return true;
+        case '.':
+            return (*(s+1) == '.' || *(s+1) == '/' || *(s+1) == '\\');
+    }
+    return *(s+1) == ':';
 }
 
 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:
@@ -82,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.");
         }