| -rw-r--r-- | src/sitecing-build.cc | 5 |
1 files changed, 3 insertions, 2 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,21 +1,22 @@ #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" @@ -69,25 +70,25 @@ void build_imports(const string& component) { 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); } } } } @@ -138,25 +139,25 @@ void build(const string& 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); |