| -rw-r--r-- | src/sitecing-build.cc | 5 | ||||
| -rw-r--r-- | src/sitecing-fastcgi.cc | 4 | ||||
| -rw-r--r-- | src/sitecing-plaincgi.cc | 4 |
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 @@ -9,2 +9,3 @@ using namespace std; +#include <konforka/util.h> #include "sitecing/sitecing_util.h" @@ -80,3 +81,3 @@ void build_http_status_handlers(const string& target) { string t = "/"; - t += normalize_path(target,strip_leading_slash); + t += konforka::normalize_path(target,konforka::strip_leading_slash); for(;;) { @@ -149,3 +150,3 @@ void build(const string& target) { continue; - string subtarget = normalize_path(target+"/"+de->d_name); + string subtarget = konforka::normalize_path(target+"/"+de->d_name); struct stat sts; 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 @@ -167,3 +167,3 @@ void sitecing_fastcgi_pm::process(int slot) { 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; @@ -186,3 +186,3 @@ void sitecing_fastcgi_pm::process(int slot) { } - string pwd = dir_name(full_component_path); + string pwd = konforka::dir_name(full_component_path); if(chdir(pwd.c_str())) 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 @@ -52,3 +52,3 @@ void process_request(configuration& config) { 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; @@ -71,3 +71,3 @@ void process_request(configuration& config) { } - string pwd = dir_name(full_component_path); + string pwd = konforka::dir_name(full_component_path); if(chdir(pwd.c_str())) |