1. setting up of SITECING_PATH_INFO environment variable

2. bumped up kingate version requirement
3. fixed a bug in component build process

5 files changed, 11 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index b9e9b56..a8aa142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,81 +1,81 @@
 AC_INIT([sitecing], [0.0.1], [sitecing-bugs@klever.net])
 AC_CONFIG_SRCDIR([include/sitecing/sitecing_parser.h])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_PROG_INSTALL
 AC_PROG_AWK
 AC_PROG_CXX
 AC_PROG_CC
 AM_PROG_LEX
 AC_PROG_LIBTOOL
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdlib.h unistd.h])
 
 AC_C_CONST
 
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 
 AC_WITH_PKGCONFIG
 
-PKG_CHECK_MODULES([KINGATE],[kingate],,[
+PKG_CHECK_MODULES([KINGATE],[kingate >= 0.0.1],,[
  AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/])
 ])
 HAVE_FCGI=false
 HAVE_PLAINCGI=false
-PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi],[
+PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi >= 0.0.1],[
  HAVE_FCGI=true
 ],[
  AC_MSG_NOTICE([no fastcgi support in kingate library])
 ])
-PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi],[
+PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi >= 0.0.1],[
  HAVE_PLAINCGI=true
 ],[
  AC_MSG_NOTICE([no plaincgi support in kingate library])
 ])
 if ! (${HAVE_FCGI} || ${HAVE_PLAINCGI}) ; then
  AC_MSG_ERROR([not a single CGI interface supported in kingate])
 fi
 AM_CONDITIONAL([HAVE_FCGI],[${HAVE_FCGI}])
 AM_CONDITIONAL([HAVE_PLAINCGI],[${HAVE_PLAINCGI}])
 
 PKG_CHECK_MODULES([DOTCONF],[dotconf],,[
  AC_MSG_ERROR([no dotconf library found])
 ])
 
 AC_WITH_PCRE([
  AC_WITH_PCREPP(,[
   AC_MSG_ERROR([no pcre++ library found])
  ])
 ],[
  AC_MSG_ERROR([no pcre library found])
 ])
 
 AC_CHECK_FUNC([dlopen],,[
  AC_CHECK_LIB([dl],[dlopen],,[
   AC_MSG_ERROR([no dlopen library found])
  ])
 ])
 
 AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
 
 WANT_DOXYGEN="yes"
 AC_ARG_ENABLE([doxygen],
  AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
  [
   test "${enableval}" = "no" && WANT_DOXYGEN="no"
  ]
 )
 if test "${WANT_DOXYGEN}" = "yes" ; then
  AC_WITH_DOXYGEN
  AC_WITH_DOT
 else
  AM_CONDITIONAL([HAVE_DOXYGEN],[false])
  AM_CONDITIONAL([HAVE_DOT],[false])
 fi
 
 AC_CONFIG_FILES([
  Makefile
   Doxyfile
diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index b5e95af..d9692de 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -47,97 +47,97 @@ namespace sitecing {
 		for(list<string>::const_iterator i=co_so_deps->so_deps.begin();i!=co_so_deps->so_deps.end();++i)
 		    deps.push_back(*i);
 	    }
 	    return;
 	}catch(utility_no_prefix& unp) {
 	    throw konforka::exception(CODEPOINT,"component is outside of component root");
 	}catch(utility_no_suffix& uns) { }
 	try {
 	    // preprocessor targets
 	    string noro = strip_prefix(dp,root_intermediate);
 	    for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
 		try {
 		    string nos = strip_suffix(noro,pp_targets[ppt]);
 		    deps.push_back(root_source+nos); // depends on the source
 		    ifstream imports((root_intermediate+nos+".imports").c_str(),ios::in);
 		    if(imports.good()) {
 			string str;
 			while(!imports.eof()) {
 			    imports >> str;
 			    if(!str.empty())
 				deps.push_back(root_intermediate+str+".classname");
 			}
 		    }
 		    ifstream ancestors((root_intermediate+nos+".ancestors").c_str(),ios::in);
 		    if(ancestors.good()) {
 			string str;
 			while(!ancestors.eof()) {
 			    ancestors >> str;
 			    if(!str.empty())
 				deps.push_back(root_intermediate+str+".classname");
 			}
 		    }
 		    // 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) {
 			for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
 			    deps.push_back(*i);
 		    }
 		    return;
 		}catch(utility_no_suffix& uns) { }
 	    }
 	    // compiler targets
 	    for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
 		try {
 		    string nos = strip_suffix(noro,cc_targets[cct]);
 		    deps.push_back(root_intermediate+nos+".cc");
 		    config_options *co_cpp_deps = config.lookup_config(noro,config_options::flag_cpp_deps);
 		    if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) {
-			ifstream df((root_intermediate+noro+".d").c_str(),ios::in);
+			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));
 			    }
 			}
 		    }
 		    // 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) {
 			for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
 			    deps.push_back(*i);
 		    }
 		}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);
 	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);
 		}catch(utility_no_suffix& uns) { }
 	    }
 	    bool rv =  file_factory::is_uptodate(dst,deps);
 	    return rv;
 	}catch(utility_no_prefix& unp) { }
 	// XXX: or just compare it off, instead of throwing things around.
 	try {
 	    strip_prefix(dp,root_so);
 	    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);
 	// sources
 	try {
 	    string noro = strip_prefix(dp,root_source);
 	    // building the sources is left up to developer
 	    return;
diff --git a/lib/file_factory.cc b/lib/file_factory.cc
index 7ca7b86..c22fac2 100644
--- a/lib/file_factory.cc
+++ b/lib/file_factory.cc
@@ -1,56 +1,56 @@
 #ifdef USE_PCH
  #include "pch.h"
 #else
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
  #include <konforka/exception.h>
  using namespace std;
  #include "sitecing/file_factory.h"
 #endif
 
 namespace sitecing {
 
     bool file_factory::is_uptodate(const string& dst,file_list_t* deps) {
 	file_list_t deplist;
 	file_list_t *fl = deps?deps:&deplist;
 	get_dependencies(dst,*fl);
 	struct stat stdst;
 	if(stat(dst.c_str(),&stdst))
 	    return false;
-	for(file_list_t::const_iterator i=fl->begin();i!=fl->end();i++) {
+	for(file_list_t::const_iterator i=fl->begin();i!=fl->end();++i) {
 	    struct stat stdep;
 	    if(stat(i->c_str(),&stdep))
 		return false;
 	    if(stdst.st_mtime<stdep.st_mtime)
 		return false;
 	    if(!is_uptodate(*i))
 		return false;
 	}
 	return true;
     }
 
     void file_factory::make(const string& dst) {
 	try {
 	    depth++;
 	    if(depth>25)
 		throw konforka::exception(CODEPOINT,"recursed too deeply.");
 	    file_list_t deps;
 	    if(!is_uptodate(dst,&deps)) {
 		for(file_list_t::const_iterator i=deps.begin();i!=deps.end();i++)
 		    make(*i);
 		if(!is_uptodate(dst,&deps))
 		    build(dst);
 	    }
 	    depth--;
 	}catch(konforka::exception& ke) {
 	    depth--;
 	    ke.see(CODEPOINT);
 	    throw;
 	}catch(...) {
 	    depth--;
 	    throw;
 	}
     }
 
 }
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc
index 9c0d7d1..756dcee 100644
--- a/src/sitecing-fastcgi.cc
+++ b/src/sitecing-fastcgi.cc
@@ -122,105 +122,108 @@ sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file)
 		die_humbly=true;
 		_exit(0);
 	    }
 	}
 	if(config.flags&configuration::flag_pid_file) {
 	    pidfile.set(config.pid_file);
 	}
 	if(multi)
 	    sem.init();
     }
 sitecing_fastcgi_pm::~sitecing_fastcgi_pm() {
     if(fss)
 	delete fss;
 }
 
 void sitecing_fastcgi_pm::process(int slot) {
     signal(SIGINT,SIG_DFL);
     signal(SIGABRT,SIG_DFL);
     signal(SIGTERM,SIG_DFL);
     give_up_privs();
     scoreboard_slot *sslot = sboard.get_slot(slot);
     try {
 	sitespace ss(config);
 	fcgi_socket& fs = *fss;
 	sitecing_interface_cgi scif(&ss);
 	string component_path;
 	string action;
 	config_options::action_handler_t *action_handler;
 	int rpc = 0;
 	if(config.flags&configuration::flag_requests_per_child)
 	    rpc = config.requests_per_child;
 	for(int req=0;(rpc<=0) || (req<rpc);rpc++) {
 	    semaphore_lock sl;
 	    if(multi) {
 		sslot->state = scoreboard_slot::state_idle;
 		sl.sem = &sem;
 		sl.lock();
 	    }
 	    sslot->state = scoreboard_slot::state_accept;
 	    fcgi_interface fi(fs);
 	    sslot->state = scoreboard_slot::state_processing;
 	    if(multi)
 		sl.unlock();
 	    cgi_gateway gw(fi);
 	    scif.prepare(&gw);
 	    try {
 		component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
 		string full_component_path;
+		string sitecing_path_info;
 		while(true) {
 		    full_component_path = config.root_source+'/'+component_path;
 		    if(!access(full_component_path.c_str(),F_OK))
 			break;
 		    string::size_type sl = component_path.rfind('/');
 		    if(sl==string::npos)
 			throw konforka::exception(CODEPOINT,"can't find the target component");
+		    sitecing_path_info.insert(0,component_path,sl,string::npos);
 		    component_path.erase(sl);
 		}
+		fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
 		action = component_path;
 		action_handler = config.lookup_action_handler(component_path);
 		if(action_handler) {
 		    action = action_handler->action;
 		}
 		string pwd = dir_name(full_component_path);
 		if(chdir(pwd.c_str()))
 		    throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
 		so_component soc = ss.fetch(action,&scif);
 		if(action_handler) {
 		    soc.ac->run(__magic_action,
 			    config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
 			    &(action_handler->args)
 			    );
 		}else{
 		    soc.ac->main(0,NULL);
 		}
 	    }catch(http_status& hs) {
 		scif.headers["Status"] = hs.status+" "+hs.message;
 		string hshp = config.lookup_http_status_handler(component_path,hs.status);
 		if(!hshp.empty()) {
 		    so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
 		    hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
 			    config.root_so.c_str(),action.c_str(),&hs);
 		}
 	    }catch(compile_error& ce) {
 		config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 		if(co_exception_handler) {
 		    so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		    eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str());
 		}else{
 		    ce.see(CODEPOINT);
 		    throw;
 		}
 	    }catch(preprocessor_error& pe) {
 		config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 		if(co_exception_handler) {
 		    so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		    eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number);
 		}else{
 		    pe.see(CODEPOINT);
 		    throw;
 		}
 	    }catch(exception& e) {
 		config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 		if(co_exception_handler) {
 		    so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		    eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e);
diff --git a/src/sitecing-plaincgi.cc b/src/sitecing-plaincgi.cc
index 6e8a215..3bd291a 100644
--- a/src/sitecing-plaincgi.cc
+++ b/src/sitecing-plaincgi.cc
@@ -7,105 +7,108 @@
 #include <errno.h>
 #include <syslog.h>
 #include <iostream>
 #include <memory>
 #include <typeinfo>
 using namespace std;
 #include "kingate/plaincgi.h"
 #include "kingate/cgi_gateway.h"
 using namespace kingate;
 #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 " Version " VERSION
 #define PCOPY   "Copyright (c) 2005 Klever Group"
 
 class cdummyClass : public acomponent {
     public:
 	void main(int _magic,va_list _args) {}
 	void *__the_most_derived_this() { return NULL; }
 } cdummyInstance;
 class adummyClass : public cgi_component {
     public:
 	void main(int _magic,va_list _args) {}
 	void *__the_most_derived_this() { return NULL; }
 } adummyInstance;
 
 void process_request(configuration& config) {
     try {
 	sitespace ss(config);
 	sitecing_interface_cgi scif(&ss);
 	string component_path;
 	string action;
 	config_options::action_handler_t *action_handler;
 	plaincgi_interface ci;
 	cgi_gateway gw(ci);
 	scif.prepare(&gw);
 	try {
 	    component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
 	    string full_component_path;
+	    string sitecing_path_info;
 	    while(true) {
 		full_component_path = config.root_source+'/'+component_path;
 		if(!access(full_component_path.c_str(),F_OK))
 		    break;
 		string::size_type sl = component_path.rfind('/');
 		if(sl==string::npos)
 		    throw konforka::exception(CODEPOINT,"can't find the target component");
+		sitecing_path_info.insert(0,component_path,sl,string::npos);
 		component_path.erase(sl);
 	    }
+	    ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
 	    action = component_path;
 	    action_handler = config.lookup_action_handler(component_path);
 	    if(action_handler) {
 		action = action_handler->action;
 	    }
 	    string pwd = dir_name(full_component_path);
 	    if(chdir(pwd.c_str()))
 		throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
 	    so_component soc = ss.fetch(action,&scif);
 	    if(action_handler) {
 		soc.ac->run(__magic_action,
 			config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
 			&(action_handler->args)
 			);
 	    }else{
 		soc.ac->main(0,NULL);
 	    }
 	}catch(http_status& hs) {
 	    scif.headers["Status"] = hs.status+" "+hs.message;
 	    string hshp = config.lookup_http_status_handler(component_path,hs.status);
 	    if(!hshp.empty()) {
 		so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
 		hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
 			config.root_so.c_str(),action.c_str(),&hs);
 	    }
 	}catch(compile_error& ce) {
 	    config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 	    if(co_exception_handler) {
 		so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str());
 	    }else{
 		ce.see(CODEPOINT);
 		throw;
 	    }
 	}catch(preprocessor_error& pe) {
 	    config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 	    if(co_exception_handler) {
 		so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number);
 	    }else{
 		pe.see(CODEPOINT);
 		throw;
 	    }
 	}catch(exception& e) {
 	    config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 	    if(co_exception_handler) {
 		so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e);