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
@@ -2,16 +2,17 @@
 #include <dirent.h>
 #include <getopt.h>
 #include <iostream>
 #include <memory>
 #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"
 #include "sitecing/cgi_component.h"
 #include "sitecing/configuration.h"
 #include "sitecing/magic.h"
 #include "sitecing/sitecing_exception.h"
@@ -73,17 +74,17 @@ 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) ) {
                 for(config_options::http_status_handlers_t::const_iterator i=lo->http_status_handlers.begin();i!=lo->http_status_handlers.end();++i) {
                     if(stop_list.find(i->first)==stop_list.end()) {
                         build_with_imports(i->second);
                         stop_list.insert(i->first);
@@ -142,17 +143,17 @@ void build(const string& target) {
         DIR *d=opendir(target_source.c_str());
         if(!d)
             throw konforka::exception(CODEPOINT,"failed to opendir()");
         for(struct dirent *de=readdir(d);de;de=readdir(d)) {
             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)) {
                 build(subtarget);
             }else{
                 if(site_space->config.match_autobuild_files(target,de->d_name)){
                     build_target(subtarget);
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
@@ -160,17 +160,17 @@ void sitecing_fastcgi_pm::process(int slot) {
             sslot->state = scoreboard_slot::state_accept;
             fcgi_interface fi(fs);
             sslot->state = scoreboard_slot::state_processing;
             if(multi)
                 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;
                     if(!access(full_component_path.c_str(),F_OK))
                         break;
                     string::size_type sl = component_path.rfind('/');
                     if(sl==string::npos)
@@ -179,17 +179,17 @@ void sitecing_fastcgi_pm::process(int slot) {
                     component_path.erase(sl);
                 }
                 fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
                 action = component_path;
                 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) {
                     soc.ac->run(__magic_action,
                             config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
                             &(action_handler->args)
                             );
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
@@ -45,17 +45,17 @@ void process_request(configuration& config) {
         sitecing_interface_cgi scif(&ss);
         string component_path;
         string action;
         config_options::action_handler_t *action_handler;
         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;
                 if(!access(full_component_path.c_str(),F_OK))
                     break;
                 string::size_type sl = component_path.rfind('/');
                 if(sl==string::npos)
@@ -64,17 +64,17 @@ void process_request(configuration& config) {
                 component_path.erase(sl);
             }
             ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
             action = component_path;
             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) {
                 soc.ac->run(__magic_action,
                         config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
                         &(action_handler->args)
                         );