moved a few utility functions to konforka and bumped konforka version requirement accordingly

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/configuration.cc b/lib/configuration.cc
index 4ee1526..6b21690 100644
--- a/lib/configuration.cc
+++ b/lib/configuration.cc
@@ -1,20 +1,21 @@
 #ifdef USE_PCH
  #include "pch.h"
 #else
  #include <unistd.h>
  #include <fnmatch.h>
  #include <cassert>
  #include <stdexcept>
  using namespace std;
+ #include <konforka/util.h>
  #include <dotconf.h>
  #include "sitecing/configuration.h"
  #include "sitecing/sitecing_util.h"
  #include "sitecing/scoreboard.h"
 #endif
 
 namespace sitecing {
 
     configuration::configuration()
 	: flags(0), autobuild(false) { }
     configuration::configuration(const string& cfile,bool ab)
 	: flags(0), autobuild(ab) {
@@ -295,25 +296,25 @@ namespace sitecing {
     }
 
     string config_options::lookup_http_status_handler(const string& status) {
 	http_status_handlers_t::const_iterator i = http_status_handlers.find(status);
 	string rv;
 	if(i!=http_status_handlers.end())
 	    rv = i->second;
 	return rv;
     }
 
     string configuration::lookup_http_status_handler(const string& target,const string& status) {
 	string t = "/";
-	t += normalize_path(target,strip_leading_slash);
+	t += konforka::normalize_path(target,konforka::strip_leading_slash);
 	string rv;
 	for(;;) {
 	    if(t[t.length()-1]=='/') {
 		loaded_options* lo = lookup_loaded_options(t);
 		if( lo && (lo->flags&config_options::flag_http_status_handlers) ) {
 		    rv = lo->lookup_http_status_handler(status);
 		    if(!rv.empty())
 			return rv;
 		}
 	    }
 	    specs_t::iterator i = specs.find(t);
 	    if( i!=specs.end() && (i->second.flags&&config_options::flag_http_status_handlers) ) {
@@ -328,25 +329,25 @@ namespace sitecing {
 		t.erase();
 	    }else{
 		if(sl==(t.length()-1))
 		    t.erase(sl);
 		else
 		    t.erase(sl+1);
 	    }
 	}
     }
 
     config_options::action_handler_t *configuration::lookup_action_handler(const string& target) {
 	string t = "/";
-	t += normalize_path(target,strip_leading_slash);
+	t += konforka::normalize_path(target,konforka::strip_leading_slash);
 	for(;;) {
 	    if(t[t.length()-1]=='/') {
 		loaded_options* lo = lookup_loaded_options(t);
 		if( lo && (lo->flags&config_options::flag_action_handlers) ) {
 		    config_options::action_handler_t *rv = lo->lookup_action_handler(target);
 		    if(rv)
 			return rv;
 		}
 	    }
 	    specs_t::iterator i = specs.find(t);
 	    if( i!=specs.end() && (i->second.flags&&config_options::flag_action_handlers) ) {
 		config_options::action_handler_t *rv = i->second.lookup_action_handler(target);
@@ -360,25 +361,25 @@ namespace sitecing {
 		t.erase();
 	    }else{
 		if(sl==(t.length()-1))
 		    t.erase(sl);
 		else
 		    t.erase(sl+1);
 	    }
 	}
     }
 
     config_options* configuration::lookup_config(const string& target,int flag) {
 	string t = "/"; // always assume leading slash
-	t += normalize_path(target,strip_leading_slash);
+	t += konforka::normalize_path(target,konforka::strip_leading_slash);
 	// XXX: reconsider precedence
 	for(;;) {
 	    if(t[t.length()-1]=='/') {
 		loaded_options* lo = lookup_loaded_options(t);
 		if( lo && (lo->flags&flag)==flag )
 		    return lo;
 	    }
 	    specs_t::iterator i = specs.find(t);
 	    if( i!=specs.end() && (i->second.flags&flag)==flag )
 		return &(i->second);
 	    if(t.empty())
 		return NULL;
@@ -405,25 +406,25 @@ namespace sitecing {
 		pat++;
 	    }
 	    if(!fnmatch(pat,fn,FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD)) {
 		rv = plus;
 		return true;
 	    }
 	}
 	return false;
     }
 
     bool configuration::match_autobuild_files(const string& target,const char *fn) {
 	string t = "/";
-	t += normalize_path(target,strip_leading_slash|strip_trailing_slash);
+	t += konforka::normalize_path(target,konforka::strip_leading_slash|konforka::strip_trailing_slash);
 	t += "/";
 	bool rv = false;
 	for(;;) {
 	    if(t[t.length()-1]=='/') {
 		loaded_options* lo = lookup_loaded_options(t);
 		if(lo && (lo->flags&config_options::flag_auto_build_files) && lo->match_autobuild_files(fn,rv) )
 		    return rv;
 	    }
 	    specs_t::iterator i = specs.find(t);
 	    if( i!=specs.end() && (i->second.flags&config_options::flag_auto_build_files) && i->second.match_autobuild_files(fn,rv) )
 		return rv;
 	    if(t.empty())