author | Michael Krelin <hacker@klever.net> | 2005-04-25 16:36:32 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-04-25 16:36:32 (UTC) |
commit | 981b219f5297ad2ccc1fc1d0e24e41ec009c35a3 (patch) (side-by-side diff) | |
tree | 9fa81d7fe70883ad26d946c902ba06edcebd4516 /src/sitecing-build.cc | |
parent | 54e344b7e3623e807b893b7febad3adfc6c1648f (diff) | |
download | sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.zip sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.tar.gz sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.tar.bz2 |
moved a few utility functions to konforka and bumped konforka version requirement accordingly
-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,25 +1,26 @@ #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; @@ -65,33 +66,33 @@ void build_imports(const string& component) { 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()) { @@ -134,33 +135,33 @@ void build(const string& target) { 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) { |