From 2280772cd1c513eb96da8e1e549bf2bcbabadb56 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Tue, 26 May 2009 18:26:13 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/SSPCPP-199 --- xmltooling/util/PathResolver.cpp | 58 +++++++++++++++++++----------- xmltooling/util/PathResolver.h | 78 ++++++++++++++++++++++++++++++++-------- 2 files changed, 100 insertions(+), 36 deletions(-) diff --git a/xmltooling/util/PathResolver.cpp b/xmltooling/util/PathResolver.cpp index f4d4975..e25000f 100644 --- a/xmltooling/util/PathResolver.cpp +++ b/xmltooling/util/PathResolver.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2007 Internet2 + * Copyright 2001-2009 Internet2 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,43 +27,59 @@ using namespace xmltooling; using namespace std; +PathResolver::PathResolver() : m_defaultPackage(PACKAGE_NAME), m_defaultPrefix("/usr") +{ + setLibDir("/usr/lib"); + setLogDir("/var/log"); + setXMLDir("/usr/share/xml"); + setRunDir("/var/run"); + setCfgDir("/etc"); +} + const string& PathResolver::resolve(string& s, file_type_t filetype, const char* pkgname, const char* prefix) const { if (!isAbsolute(s.c_str())) { switch (filetype) { case XMLTOOLING_LIB_FILE: - s = string(prefix ? prefix : m_defaultPrefix) + -#if (SIZEOF_LONG == 8) - "/lib64/" -#else - "/lib/" -#endif - + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + s = m_lib + '/' + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + if (!isAbsolute(m_lib.c_str())) + s = string(prefix ? prefix : m_defaultPrefix) + '/' + s; break; case XMLTOOLING_LOG_FILE: - if (prefix || m_defaultPrefix != "/usr") - s = string(prefix ? prefix : m_defaultPrefix) + "/var/log/" + (pkgname ? pkgname : m_defaultPackage) + '/' + s; - else - s = string("/var/log/") + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + s = m_log + '/' + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + if (!isAbsolute(m_log.c_str())) { + if (prefix || m_defaultPrefix != "/usr") + s = string(prefix ? prefix : m_defaultPrefix) + '/' + s; + else + s = string("/") + s; + } break; case XMLTOOLING_XML_FILE: - s = string(prefix ? prefix : m_defaultPrefix) + "/share/xml/" + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + s = m_xml + '/' + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + if (!isAbsolute(m_xml.c_str())) + s = string(prefix ? prefix : m_defaultPrefix) + '/' + s; break; case XMLTOOLING_RUN_FILE: - if (prefix || m_defaultPrefix != "/usr") - s = string(prefix ? prefix : m_defaultPrefix) + "/var/run/" + (pkgname ? pkgname : m_defaultPackage) + '/' + s; - else - s = string("/var/run/") + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + s = m_run + '/' + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + if (!isAbsolute(m_run.c_str())) { + if (prefix || m_defaultPrefix != "/usr") + s = string(prefix ? prefix : m_defaultPrefix) + '/' + s; + else + s = string("/") + s; + } break; case XMLTOOLING_CFG_FILE: - if (prefix || m_defaultPrefix != "/usr") - s = string(prefix ? prefix : m_defaultPrefix) + "/etc/" + (pkgname ? pkgname : m_defaultPackage) + '/' + s; - else - s = string("/etc/") + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + s = m_cfg + '/' + (pkgname ? pkgname : m_defaultPackage) + '/' + s; + if (!isAbsolute(m_cfg.c_str())) { + if (prefix || m_defaultPrefix != "/usr") + s = string(prefix ? prefix : m_defaultPrefix) + '/' + s; + else + s = string("/") + s; + } break; default: diff --git a/xmltooling/util/PathResolver.h b/xmltooling/util/PathResolver.h index 23f6d94..4f12ee8 100644 --- a/xmltooling/util/PathResolver.h +++ b/xmltooling/util/PathResolver.h @@ -1,6 +1,6 @@ /* - * Copyright 2001-2007 Internet2 - * + * Copyright 2001-2009 Internet2 + * * 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 @@ -16,7 +16,7 @@ /** * @file xmltooling/util/PathResolver.h - * + * * Resolves local filenames into absolute pathnames. */ @@ -28,7 +28,6 @@ #include namespace xmltooling { - /** * Resolves local filenames into absolute pathnames. */ @@ -36,10 +35,9 @@ namespace xmltooling { { MAKE_NONCOPYABLE(PathResolver); public: - PathResolver() : m_defaultPackage("xmltooling"), m_defaultPrefix("/usr") {} - + PathResolver(); virtual ~PathResolver() {} - + /** Types of file resources to resolve. */ enum file_type_t { XMLTOOLING_LIB_FILE, @@ -48,33 +46,83 @@ namespace xmltooling { XMLTOOLING_RUN_FILE, XMLTOOLING_CFG_FILE }; - + /** * Set the default package to use when resolving files. * - * @param pkgname name of default package to use + * @param pkgname name of default package to use */ virtual void setDefaultPackageName(const char* pkgname) { m_defaultPackage = pkgname; } /** - * Set the default istallation prefix to use when resolving files. + * Set the default installation prefix to use when resolving files. * - * @param prefix name of default prefix to use + * @param prefix name of default prefix to use */ virtual void setDefaultPrefix(const char* prefix) { m_defaultPrefix = prefix; } - + + /** + * Set the lib directory to use when resolving files. + *

If relative, the default prefix will be prepended. + * + * @param dir the library directory to use + */ + virtual void setLibDir(const char* dir) { + m_lib = dir; + } + + /** + * Set the log directory to use when resolving files. + *

If relative, the default prefix will be prepended. + * + * @param dir the log directory to use + */ + virtual void setLogDir(const char* dir) { + m_log = dir; + } + + /** + * Set the XML directory to use when resolving files. + *

If relative, the default prefix will be prepended. + * + * @param dir the XML directory to use + */ + virtual void setXMLDir(const char* dir) { + m_xml = dir; + } + + /** + * Set the run directory to use when resolving files. + *

If relative, the default prefix will be prepended. + * + * @param dir the run directory to use + */ + virtual void setRunDir(const char* dir) { + m_run = dir; + } + + /** + * Set the config directory to use when resolving files. + *

If relative, the default prefix will be prepended. + * + * @param dir the config directory to use + */ + virtual void setCfgDir(const char* dir) { + m_cfg = dir; + } + /** * Changes the input filename into an absolute pathname to the same file. - * + * * @param s filename to resolve * @param filetype type of file being resolved * @param pkgname application package name to use in resolving the file (or NULL for the default) * @param prefix installation prefix to use in resolving the file (or NULL for the default) - * + * * @return a const reference to the input string */ virtual const std::string& resolve(std::string& s, file_type_t filetype, const char* pkgname=NULL, const char* prefix=NULL) const; @@ -91,7 +139,7 @@ namespace xmltooling { return *(s+1) == ':'; } - std::string m_defaultPackage,m_defaultPrefix; + std::string m_defaultPackage,m_defaultPrefix,m_lib,m_log,m_xml,m_run,m_cfg; }; }; -- 2.1.4