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) (unidiff) | |
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 | |||
@@ -2,16 +2,17 @@ | |||
2 | #include <dirent.h> | 2 | #include <dirent.h> |
3 | #include <getopt.h> | 3 | #include <getopt.h> |
4 | #include <iostream> | 4 | #include <iostream> |
5 | #include <memory> | 5 | #include <memory> |
6 | #include <fstream> | 6 | #include <fstream> |
7 | #include <cassert> | 7 | #include <cassert> |
8 | #include <set> | 8 | #include <set> |
9 | using namespace std; | 9 | using namespace std; |
10 | #include <konforka/util.h> | ||
10 | #include "sitecing/sitecing_util.h" | 11 | #include "sitecing/sitecing_util.h" |
11 | #include "sitecing/util.h" | 12 | #include "sitecing/util.h" |
12 | #include "sitecing/sitespace.h" | 13 | #include "sitecing/sitespace.h" |
13 | #include "sitecing/sitecing_interface_cgi.h" | 14 | #include "sitecing/sitecing_interface_cgi.h" |
14 | #include "sitecing/cgi_component.h" | 15 | #include "sitecing/cgi_component.h" |
15 | #include "sitecing/configuration.h" | 16 | #include "sitecing/configuration.h" |
16 | #include "sitecing/magic.h" | 17 | #include "sitecing/magic.h" |
17 | #include "sitecing/sitecing_exception.h" | 18 | #include "sitecing/sitecing_exception.h" |
@@ -73,17 +74,17 @@ void build_imports(const string& component) { | |||
73 | } | 74 | } |
74 | } | 75 | } |
75 | } | 76 | } |
76 | 77 | ||
77 | void build_http_status_handlers(const string& target) { | 78 | void build_http_status_handlers(const string& target) { |
78 | assert(site_space); | 79 | assert(site_space); |
79 | set<string> stop_list; | 80 | set<string> stop_list; |
80 | string t = "/"; | 81 | string t = "/"; |
81 | t += normalize_path(target,strip_leading_slash); | 82 | t += konforka::normalize_path(target,konforka::strip_leading_slash); |
82 | for(;;) { | 83 | for(;;) { |
83 | if(t[t.length()-1]=='/') { | 84 | if(t[t.length()-1]=='/') { |
84 | loaded_options* lo = site_space->config.lookup_loaded_options(t); | 85 | loaded_options* lo = site_space->config.lookup_loaded_options(t); |
85 | if( lo && (lo->flags&config_options::flag_http_status_handlers) ) { | 86 | if( lo && (lo->flags&config_options::flag_http_status_handlers) ) { |
86 | for(config_options::http_status_handlers_t::const_iterator i=lo->http_status_handlers.begin();i!=lo->http_status_handlers.end();++i) { | 87 | for(config_options::http_status_handlers_t::const_iterator i=lo->http_status_handlers.begin();i!=lo->http_status_handlers.end();++i) { |
87 | if(stop_list.find(i->first)==stop_list.end()) { | 88 | if(stop_list.find(i->first)==stop_list.end()) { |
88 | build_with_imports(i->second); | 89 | build_with_imports(i->second); |
89 | stop_list.insert(i->first); | 90 | stop_list.insert(i->first); |
@@ -142,17 +143,17 @@ void build(const string& target) { | |||
142 | DIR *d=opendir(target_source.c_str()); | 143 | DIR *d=opendir(target_source.c_str()); |
143 | if(!d) | 144 | if(!d) |
144 | throw konforka::exception(CODEPOINT,"failed to opendir()"); | 145 | throw konforka::exception(CODEPOINT,"failed to opendir()"); |
145 | for(struct dirent *de=readdir(d);de;de=readdir(d)) { | 146 | for(struct dirent *de=readdir(d);de;de=readdir(d)) { |
146 | if(!strcmp(de->d_name,".")) | 147 | if(!strcmp(de->d_name,".")) |
147 | continue; | 148 | continue; |
148 | if(!strcmp(de->d_name,"..")) | 149 | if(!strcmp(de->d_name,"..")) |
149 | continue; | 150 | continue; |
150 | string subtarget = normalize_path(target+"/"+de->d_name); | 151 | string subtarget = konforka::normalize_path(target+"/"+de->d_name); |
151 | struct stat sts; | 152 | struct stat sts; |
152 | if(stat((site_space->config.root_source+subtarget).c_str(),&sts)) | 153 | if(stat((site_space->config.root_source+subtarget).c_str(),&sts)) |
153 | throw konforka::exception(CODEPOINT,"failed to stat() subtarget"); | 154 | throw konforka::exception(CODEPOINT,"failed to stat() subtarget"); |
154 | if(S_ISDIR(sts.st_mode)) { | 155 | if(S_ISDIR(sts.st_mode)) { |
155 | build(subtarget); | 156 | build(subtarget); |
156 | }else{ | 157 | }else{ |
157 | if(site_space->config.match_autobuild_files(target,de->d_name)){ | 158 | if(site_space->config.match_autobuild_files(target,de->d_name)){ |
158 | build_target(subtarget); | 159 | build_target(subtarget); |