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

3 files changed, 7 insertions, 6 deletions

diff --git a/src/sitecing-build.cc b/src/sitecing-build.cc
index 4cad0a3..887ef83 100644
--- a/src/sitecing-build.cc
+++ b/src/sitecing-build.cc
@@ -6,8 +6,9 @@
 #include <fstream>
 #include <cassert>
 #include <set>
 using namespace std;
+#include <konforka/util.h>
 #include "sitecing/sitecing_util.h"
 #include "sitecing/util.h"
 #include "sitecing/sitespace.h"
 #include "sitecing/sitecing_interface_cgi.h"
@@ -77,9 +78,9 @@ void build_imports(const string& component) {
 void build_http_status_handlers(const string& target) {
     assert(site_space);
     set<string> stop_list;
     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 = site_space->config.lookup_loaded_options(t);
 	    if( lo && (lo->flags&config_options::flag_http_status_handlers) ) {
@@ -146,9 +147,9 @@ void build(const string& target) {
 	    if(!strcmp(de->d_name,"."))
 		continue;
 	    if(!strcmp(de->d_name,".."))
 		continue;
-	    string subtarget = normalize_path(target+"/"+de->d_name);
+	    string subtarget = konforka::normalize_path(target+"/"+de->d_name);
 	    struct stat sts;
 	    if(stat((site_space->config.root_source+subtarget).c_str(),&sts))
 		throw konforka::exception(CODEPOINT,"failed to stat() subtarget");
 	    if(S_ISDIR(sts.st_mode)) {
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc
index 756dcee..03587aa 100644
--- a/src/sitecing-fastcgi.cc
+++ b/src/sitecing-fastcgi.cc
@@ -164,9 +164,9 @@ void sitecing_fastcgi_pm::process(int slot) {
 		sl.unlock();
 	    cgi_gateway gw(fi);
 	    scif.prepare(&gw);
 	    try {
-		component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
+		component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash);
 		string full_component_path;
 		string sitecing_path_info;
 		while(true) {
 		    full_component_path = config.root_source+'/'+component_path;
@@ -183,9 +183,9 @@ void sitecing_fastcgi_pm::process(int slot) {
 		action_handler = config.lookup_action_handler(component_path);
 		if(action_handler) {
 		    action = action_handler->action;
 		}
-		string pwd = dir_name(full_component_path);
+		string pwd = konforka::dir_name(full_component_path);
 		if(chdir(pwd.c_str()))
 		    throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
 		so_component soc = ss.fetch(action,&scif);
 		if(action_handler) {
diff --git a/src/sitecing-plaincgi.cc b/src/sitecing-plaincgi.cc
index 3bd291a..2f93cc5 100644
--- a/src/sitecing-plaincgi.cc
+++ b/src/sitecing-plaincgi.cc
@@ -49,9 +49,9 @@ void process_request(configuration& config) {
 	plaincgi_interface ci;
 	cgi_gateway gw(ci);
 	scif.prepare(&gw);
 	try {
-	    component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
+	    component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash);
 	    string full_component_path;
 	    string sitecing_path_info;
 	    while(true) {
 		full_component_path = config.root_source+'/'+component_path;
@@ -68,9 +68,9 @@ void process_request(configuration& config) {
 	    action_handler = config.lookup_action_handler(component_path);
 	    if(action_handler) {
 		action = action_handler->action;
 	    }
-	    string pwd = dir_name(full_component_path);
+	    string pwd = konforka::dir_name(full_component_path);
 	    if(chdir(pwd.c_str()))
 		throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
 	    so_component soc = ss.fetch(action,&scif);
 	    if(action_handler) {