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
@@ -1,198 +1,199 @@
 #include <sys/types.h>
 #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"
 #include "sitecing/exception.h"
 using namespace sitecing;
 
 #include "config.h"
 #define PHEADER PACKAGE "-build Version " VERSION
 #define PCOPY   "Copyright (c) 2004 Klever Group"
 
 static sitespace* site_space = NULL;
 typedef pair<dev_t,ino_t> the_inode_t;
 set<the_inode_t> built_inodes;
 
 void build_component(const string& component) {
     assert(site_space);
     cerr << "Building " << component << endl;
     try {
         site_space->factory.make(site_space->config.root_so+component+".so");
     }catch(compile_error& ce) {
         ce.see(CODEPOINT);
         ifstream err((site_space->config.root_intermediate+ce.component_path+".stderr").c_str(),ios::in);
         if(err) {
             cerr << err.rdbuf();
         }
         throw;
     }catch(preprocessor_error& pe) {
         pe.see(CODEPOINT);
         cerr << site_space->config.root_source << pe.component_name << ":" << pe.line_number << ":" << pe.what() << endl;
         throw;
     }
 }
 
 void build_imports(const string& component);
 
 void build_with_imports(const string& component) {
     assert(site_space);
     struct stat st;
     string cp = site_space->config.root_source+component;
     if(!lstat(cp.c_str(),&st)) {
         if(built_inodes.find(the_inode_t(st.st_dev,st.st_ino))!=built_inodes.end())
             return;
         built_inodes.insert(the_inode_t(st.st_dev,st.st_ino));
     }
     build_component(component);
     build_imports(component);
 }
 
 void build_imports(const string& component) {
     assert(site_space);
     ifstream ifs((site_space->config.root_intermediate+component+".imports").c_str(),ios::in);
     cerr << "Building components imported by " << component << endl;
     if(ifs) {
         string import;
         while(!ifs.eof()) {
             ifs >> import;
             if(!import.empty())
                 build_with_imports(import);
         }
     }
 }
 
 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);
                     }
                 }
             }
         }
         configuration::specs_t::iterator i=site_space->config.specs.find(t);
         if( i!=site_space->config.specs.end() && (i->second.flags&config_options::flag_http_status_handlers) ) {
             for(config_options::http_status_handlers_t::const_iterator ii=i->second.http_status_handlers.begin();ii!=i->second.http_status_handlers.end();++i) {
                 if(stop_list.find(ii->first)==stop_list.end()) {
                     build_with_imports(ii->second);
                     stop_list.insert(ii->first);
                 }
             }
         }
         if(t.empty())
             return;
         string::size_type sl=t.rfind('/');
         if(sl==string::npos) {
             t.erase();
         }else{
             if(sl==(t.length()-1))
                 t.erase(sl);
             else
                 t.erase(sl+1);
         }
     }
 }
 
 void build_target(const string& target) {
     assert(site_space);
     string action = target;
     config_options::action_handler_t *ah = site_space->config.lookup_action_handler(target);
     if(ah)
         action = ah->action;
     build_with_imports(action);
 }
 
 void build(const string& target) {
     assert(site_space);
     build_http_status_handlers(target);
     config_options *co_exception_handler = site_space->config.lookup_config(target,config_options::flag_exception_handler);
     if(co_exception_handler) {
         string handler = co_exception_handler->exception_handler;
         build_with_imports(handler);
     }
     string target_source = site_space->config.root_source+target;
     struct stat st;
     if(stat(target_source.c_str(),&st))
         throw konforka::exception(CODEPOINT,"failed to stat() target");
     if(S_ISREG(st.st_mode)) {
         build_target(target);
     }else if(S_ISDIR(st.st_mode)) {
         build_http_status_handlers(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);
                 }
             }
         }
         closedir(d);
     }
 }
 
 int main(int argc,char **argv) {
     try {
         string config_file = "sitecing.conf";
         while(true) {
             static struct option opts[] = {
                 { "help", no_argument, 0, 'h' },
                 { "usage", no_argument, 0, 'h' },
                 { "version", no_argument, 0, 'V' },
                 { "license", no_argument, 0, 'L' },
                 { "config", required_argument, 0, 'f' },
                 { NULL, 0, 0, 0 }
             };
             int c = getopt_long(argc,argv,"f:hVL",opts,NULL);
             if(c==-1)
                 break;
             switch(c) {
                 case 'h':
                     cerr << PHEADER << endl
                         << PCOPY << endl << endl
                         << " -h, --help" << endl
                         << " --usage          display this text" << endl
                         << " -V, --version    display version number" << endl
                         << " -L, --license    show license" << endl
                         << " -f filename, --config=filename" << endl
                         << "                  specify configuration file to use" << endl;
                     exit(0);
                     break;
                 case 'V':
                     cerr << VERSION << endl;
                     exit(0);
                     break;
                 case 'L':
                     extern const char *COPYING;
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
@@ -120,116 +120,116 @@ sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file)
                 throw konforka::exception(CODEPOINT,"failed to fork()");
             if(pf) {
                 die_humbly=true;
                 _exit(0);
             }
         }
         if(config.flags&configuration::flag_pid_file) {
             pidfile.set(config.pid_file);
         }
         if(multi)
             sem.init();
     }
 sitecing_fastcgi_pm::~sitecing_fastcgi_pm() {
     if(fss)
         delete fss;
 }
 
 void sitecing_fastcgi_pm::process(int slot) {
     signal(SIGINT,SIG_DFL);
     signal(SIGABRT,SIG_DFL);
     signal(SIGTERM,SIG_DFL);
     give_up_privs();
     scoreboard_slot *sslot = sboard.get_slot(slot);
     try {
         sitespace ss(config);
         fcgi_socket& fs = *fss;
         sitecing_interface_cgi scif(&ss);
         string component_path;
         string action;
         config_options::action_handler_t *action_handler;
         int rpc = 0;
         if(config.flags&configuration::flag_requests_per_child)
             rpc = config.requests_per_child;
         for(int req=0;(rpc<=0) || (req<rpc);rpc++) {
             semaphore_lock sl;
             if(multi) {
                 sslot->state = scoreboard_slot::state_idle;
                 sl.sem = &sem;
                 sl.lock();
             }
             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)
                         throw konforka::exception(CODEPOINT,"can't find the target component");
                     sitecing_path_info.insert(0,component_path,sl,string::npos);
                     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)
                             );
                 }else{
                     soc.ac->main(0,NULL);
                 }
             }catch(http_status& hs) {
                 scif.headers["Status"] = hs.status+" "+hs.message;
                 string hshp = config.lookup_http_status_handler(component_path,hs.status);
                 if(!hshp.empty()) {
                     so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
                     hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
                             config.root_so.c_str(),action.c_str(),&hs);
                 }
             }catch(compile_error& ce) {
                 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
                 if(co_exception_handler) {
                     so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
                     eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str());
                 }else{
                     ce.see(CODEPOINT);
                     throw;
                 }
             }catch(preprocessor_error& pe) {
                 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
                 if(co_exception_handler) {
                     so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
                     eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number);
                 }else{
                     pe.see(CODEPOINT);
                     throw;
                 }
             }catch(exception& e) {
                 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
                 if(co_exception_handler) {
                     so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
                     eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e);
                 }
             }
             scif.flush();
         }
     }catch(exception& e) {
         cerr << "->Oops: " << e.what() << endl;
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
@@ -5,116 +5,116 @@
 #include <pwd.h>
 #include <grp.h>
 #include <errno.h>
 #include <syslog.h>
 #include <iostream>
 #include <memory>
 #include <typeinfo>
 using namespace std;
 #include "kingate/plaincgi.h"
 #include "kingate/cgi_gateway.h"
 using namespace kingate;
 #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"
 #include "sitecing/exception.h"
 using namespace sitecing;
 
 #include "config.h"
 #define PHEADER PACKAGE " Version " VERSION
 #define PCOPY   "Copyright (c) 2005 Klever Group"
 
 class cdummyClass : public acomponent {
     public:
         void main(int _magic,va_list _args) {}
         void *__the_most_derived_this() { return NULL; }
 } cdummyInstance;
 class adummyClass : public cgi_component {
     public:
         void main(int _magic,va_list _args) {}
         void *__the_most_derived_this() { return NULL; }
 } adummyInstance;
 
 void process_request(configuration& config) {
     try {
         sitespace ss(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)
                     throw konforka::exception(CODEPOINT,"can't find the target component");
                 sitecing_path_info.insert(0,component_path,sl,string::npos);
                 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)
                         );
             }else{
                 soc.ac->main(0,NULL);
             }
         }catch(http_status& hs) {
             scif.headers["Status"] = hs.status+" "+hs.message;
             string hshp = config.lookup_http_status_handler(component_path,hs.status);
             if(!hshp.empty()) {
                 so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
                 hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
                         config.root_so.c_str(),action.c_str(),&hs);
             }
         }catch(compile_error& ce) {
             config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
             if(co_exception_handler) {
                 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
                 eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str());
             }else{
                 ce.see(CODEPOINT);
                 throw;
             }
         }catch(preprocessor_error& pe) {
             config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
             if(co_exception_handler) {
                 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
                 eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number);
             }else{
                 pe.see(CODEPOINT);
                 throw;
             }
         }catch(exception& e) {
             config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
             if(co_exception_handler) {
                 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
                 eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e);
             }
         }
         scif.flush();
     }catch(exception& e) {
         cerr << "->Oops: " << e.what() << endl;
     }