1 files changed, 16 insertions, 15 deletions

diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index d9692de..af3d911 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -8,12 +8,13 @@
  #include <fcntl.h>
  #include <iostream>
  #include <fstream>
  #include <stdexcept>
  #include <vector>
  using namespace std;
+ #include <konforka/util.h>
  #include "sitecing/component_factory.h"
  #include "sitecing/sitecing_util.h"
  #include "sitecing/sitecing_parser.h"
  #include "sitecing/sitecing_exception.h"
 #endif
  
@@ -21,20 +22,20 @@ namespace sitecing {
 
     static const char *pp_targets[] = { ".cc", ".h", ".imports", ".classname", ".baseclassname", ".ancestors", ".pp_stamp" };
     static const char *cc_targets[] = { ".o", ".d" };
 
     component_factory::component_factory(configuration& c)
         : config(c),
-    root_source(normalize_path(c.root_source,strip_trailing_slash)+'/'),
-    root_intermediate(normalize_path(c.root_intermediate,strip_trailing_slash)+'/'),
-    root_so(normalize_path(c.root_so,strip_trailing_slash)+'/') {
+    root_source(konforka::normalize_path(c.root_source,konforka::strip_trailing_slash)+'/'),
+    root_intermediate(konforka::normalize_path(c.root_intermediate,konforka::strip_trailing_slash)+'/'),
+    root_so(konforka::normalize_path(c.root_so,konforka::strip_trailing_slash)+'/') {
     }
 
     void component_factory::get_dependencies(const string& dst,file_list_t& deps) {
         deps.clear();
-        string dp = normalize_path(dst,strip_trailing_slash);
+        string dp = konforka::normalize_path(dst,konforka::strip_trailing_slash);
         // source documents
         try { // XXX: or just compare it off?
             string noro = strip_prefix(dp,root_source);
             return;
         }catch(utility_no_affix& una) { }
         // .so binaries
@@ -95,13 +96,13 @@ namespace sitecing {
                         ifstream df((root_intermediate+nos+".d").c_str(),ios::in);
                         if(df.good()) {
                             string str;
                             while(!df.eof()) {
                                 df >> str;
                                 if(str.find_first_of("\\:")==string::npos)
-                                    deps.push_back(combine_path(config.root_source+nos,str));
+                                    deps.push_back(konforka::combine_path(config.root_source+nos,str));
                             }
                         }
                     }
                     // XXX: intermediate_deps should be broken down
                     config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
                     if(co_intermediate_deps) {
@@ -111,13 +112,13 @@ namespace sitecing {
                 }catch(utility_no_suffix& uns) { }
             }
         }catch(utility_no_prefix& unp) { }
     }
 
     bool component_factory::is_uptodate(const string& dst,file_list_t *deps) {
-        string dp = normalize_path(dst,strip_trailing_slash);
+        string dp = konforka::normalize_path(dst,konforka::strip_trailing_slash);
         try {
             string noro = strip_prefix(dp,root_intermediate);
             for(int ppt=0;(ppt+1)<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
                 try {
                     string nos = strip_suffix(noro,pp_targets[ppt]);
                     return file_factory::is_uptodate(root_intermediate+nos+".pp_stamp",deps);
@@ -132,13 +133,13 @@ namespace sitecing {
             return file_factory::is_uptodate(dst,deps);
         }catch(utility_no_prefix& unp) { }
         return true;
     }
 
     void component_factory::build(const string& dst) {
-        string dp = normalize_path(dst,strip_trailing_slash);
+        string dp = konforka::normalize_path(dst,konforka::strip_trailing_slash);
         // sources
         try {
             string noro = strip_prefix(dp,root_source);
             // building the sources is left up to developer
             return;
         }catch(utility_no_prefix& unp) { }
@@ -147,13 +148,13 @@ namespace sitecing {
             string noso = strip_suffix(dp,".so");
             string noro = strip_prefix(noso,root_so);
             string o = root_intermediate+noro+".o";
             cerr << "Linking " << noro << endl;
             if(access(o.c_str(),R_OK))
                 throw konforka::exception(CODEPOINT,string("can't access compiled component code (")+o+")");
-            make_path(dir_name(root_so+noro),0755);
+            konforka::make_path(konforka::dir_name(root_so+noro),0755);
             file_lock lock_cc(root_intermediate+noro+".o.lock");
             file_lock lock_so(root_so+noro+".so.lock");
             int stdO = open((root_intermediate+noro+".ld.stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
             if(stdO<0)
                 throw konforka::exception(CODEPOINT,"failed to open/create linker stdout");
             int stdE = open((root_intermediate+noro+".ld.stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
@@ -192,14 +193,14 @@ namespace sitecing {
                     string nos = strip_suffix(noro,cc_targets[cct]);
                     string cc = root_intermediate+nos+".cc";
                     string o = root_intermediate+nos+".o";
                     cerr << "Compiling " << nos << endl;
                     if(access(cc.c_str(),R_OK))
                         throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")");
-                    make_path(dir_name(cc),0755);
-                    string pwd = dir_name(root_source+nos);
+                    konforka::make_path(konforka::dir_name(cc),0755);
+                    string pwd = konforka::dir_name(root_source+nos);
                     auto_chdir dir_changer(pwd);
                     file_lock lock_source(root_intermediate+nos+".lock");
                     file_lock lock_cc(root_intermediate+nos+".o.lock");
                     int stdO = open((root_intermediate+nos+".stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
                     if(stdO<0)
                         throw konforka::exception(CODEPOINT,"failed to open/create compiler stdout");
@@ -232,20 +233,20 @@ namespace sitecing {
                 try {
                     string nos = strip_suffix(noro,pp_targets[ppt]);
                     string src = root_source+nos;
                     cerr << "Preprocessing " << nos << endl;
                     if(access(src.c_str(),R_OK))
                         throw konforka::exception(CODEPOINT,string("can't access component source (")+src+")");
-                    make_path(dir_name(root_intermediate+nos),0755);
+                    konforka::make_path(konforka::dir_name(root_intermediate+nos),0755);
                     file_lock lock(root_intermediate+nos+".lock");
                     sitecing_parser parser(*this);
                     config_options *co_skeleton = config.lookup_config(nos,config_options::flag_skeleton);
                     if(co_skeleton)
                         parser.skeleton = co_skeleton->skeleton;
                     static const char *id_chars = "abcdefghijklmnopqrstuvwxyz0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-                    parser.class_name = normalize_path(nos,strip_leading_slash|strip_trailing_slash);
+                    parser.class_name = konforka::normalize_path(nos,konforka::strip_leading_slash|konforka::strip_trailing_slash);
                     for(string::size_type illc = parser.class_name.find_first_not_of(id_chars);illc!=string::npos;illc=parser.class_name.find_first_not_of(id_chars,illc)) {
                         string::size_type lc = parser.class_name.find_first_of(id_chars,illc);
                         int n = ((lc==string::npos)?parser.class_name.length():lc)-illc;
                         parser.class_name.replace(illc,n,n,'_');
                     }
                     parser.class_name = "_SCC_"+parser.class_name;
@@ -265,13 +266,13 @@ namespace sitecing {
             }
         }catch(utility_no_prefix& unp) { }
         cerr << "ignoring build request for " << dp << endl;
     }
 
     void component_factory::make(const string& dst) {
-        string dp = normalize_path(dst,strip_trailing_slash);
+        string dp = konforka::normalize_path(dst,konforka::strip_trailing_slash);
         try {
             string noso = strip_suffix(dp,".so");
             string noro = strip_prefix(noso,root_so);
             file_list_t a;
             get_ancestors(noro,a);
             for(file_list_t::const_iterator i=a.begin();i!=a.end();++i) {
@@ -314,23 +315,23 @@ namespace sitecing {
         if(waitpid(pid,&rv,0)<0)
             throw konforka::exception(CODEPOINT,"failed to waitpid()");
         return rv;
     }
 
     string component_factory::get_classname(const string& component) {
-        string cn = root_intermediate+normalize_path(component,strip_trailing_slash|strip_leading_slash)+".classname";
+        string cn = root_intermediate+konforka::normalize_path(component,konforka::strip_trailing_slash|konforka::strip_leading_slash)+".classname";
         make(cn);
         ifstream ifs(cn.c_str());
         if(!ifs.good())
             throw konforka::exception(CODEPOINT,"failed to access component .classname");
         ifs >> cn;
         return cn;
     }
 
     void component_factory::get_ancestors(const string& component,file_list_t& rv) {
-        string cn = root_intermediate+normalize_path(component,strip_trailing_slash|strip_leading_slash)+".ancestors";
+        string cn = root_intermediate+konforka::normalize_path(component,konforka::strip_trailing_slash|konforka::strip_leading_slash)+".ancestors";
         make(cn);
         ifstream ifs(cn.c_str());
         if(!ifs.good())
             throw konforka::exception(CODEPOINT,string("failed to access component '")+component+"' .ancestors");
         rv.clear();
         while(!ifs.eof()) {