summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac6
-rw-r--r--lib/component_factory.cc2
-rw-r--r--lib/file_factory.cc2
-rw-r--r--src/sitecing-fastcgi.cc3
-rw-r--r--src/sitecing-plaincgi.cc3
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,89 +1,89 @@
1AC_INIT([sitecing], [0.0.1], [sitecing-bugs@klever.net]) 1AC_INIT([sitecing], [0.0.1], [sitecing-bugs@klever.net])
2AC_CONFIG_SRCDIR([include/sitecing/sitecing_parser.h]) 2AC_CONFIG_SRCDIR([include/sitecing/sitecing_parser.h])
3AC_CONFIG_HEADER([config.h]) 3AC_CONFIG_HEADER([config.h])
4AM_INIT_AUTOMAKE([dist-bzip2]) 4AM_INIT_AUTOMAKE([dist-bzip2])
5 5
6AC_PROG_INSTALL 6AC_PROG_INSTALL
7AC_PROG_AWK 7AC_PROG_AWK
8AC_PROG_CXX 8AC_PROG_CXX
9AC_PROG_CC 9AC_PROG_CC
10AM_PROG_LEX 10AM_PROG_LEX
11AC_PROG_LIBTOOL 11AC_PROG_LIBTOOL
12 12
13AC_HEADER_STDC 13AC_HEADER_STDC
14AC_CHECK_HEADERS([stdlib.h unistd.h]) 14AC_CHECK_HEADERS([stdlib.h unistd.h])
15 15
16AC_C_CONST 16AC_C_CONST
17 17
18AC_FUNC_MALLOC 18AC_FUNC_MALLOC
19AC_FUNC_REALLOC 19AC_FUNC_REALLOC
20 20
21AC_WITH_PKGCONFIG 21AC_WITH_PKGCONFIG
22 22
23PKG_CHECK_MODULES([KINGATE],[kingate],,[ 23PKG_CHECK_MODULES([KINGATE],[kingate >= 0.0.1],,[
24 AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/]) 24 AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/])
25]) 25])
26HAVE_FCGI=false 26HAVE_FCGI=false
27HAVE_PLAINCGI=false 27HAVE_PLAINCGI=false
28PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi],[ 28PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi >= 0.0.1],[
29 HAVE_FCGI=true 29 HAVE_FCGI=true
30],[ 30],[
31 AC_MSG_NOTICE([no fastcgi support in kingate library]) 31 AC_MSG_NOTICE([no fastcgi support in kingate library])
32]) 32])
33PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi],[ 33PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi >= 0.0.1],[
34 HAVE_PLAINCGI=true 34 HAVE_PLAINCGI=true
35],[ 35],[
36 AC_MSG_NOTICE([no plaincgi support in kingate library]) 36 AC_MSG_NOTICE([no plaincgi support in kingate library])
37]) 37])
38if ! (${HAVE_FCGI} || ${HAVE_PLAINCGI}) ; then 38if ! (${HAVE_FCGI} || ${HAVE_PLAINCGI}) ; then
39 AC_MSG_ERROR([not a single CGI interface supported in kingate]) 39 AC_MSG_ERROR([not a single CGI interface supported in kingate])
40fi 40fi
41AM_CONDITIONAL([HAVE_FCGI],[${HAVE_FCGI}]) 41AM_CONDITIONAL([HAVE_FCGI],[${HAVE_FCGI}])
42AM_CONDITIONAL([HAVE_PLAINCGI],[${HAVE_PLAINCGI}]) 42AM_CONDITIONAL([HAVE_PLAINCGI],[${HAVE_PLAINCGI}])
43 43
44PKG_CHECK_MODULES([DOTCONF],[dotconf],,[ 44PKG_CHECK_MODULES([DOTCONF],[dotconf],,[
45 AC_MSG_ERROR([no dotconf library found]) 45 AC_MSG_ERROR([no dotconf library found])
46]) 46])
47 47
48AC_WITH_PCRE([ 48AC_WITH_PCRE([
49 AC_WITH_PCREPP(,[ 49 AC_WITH_PCREPP(,[
50 AC_MSG_ERROR([no pcre++ library found]) 50 AC_MSG_ERROR([no pcre++ library found])
51 ]) 51 ])
52],[ 52],[
53 AC_MSG_ERROR([no pcre library found]) 53 AC_MSG_ERROR([no pcre library found])
54]) 54])
55 55
56AC_CHECK_FUNC([dlopen],,[ 56AC_CHECK_FUNC([dlopen],,[
57 AC_CHECK_LIB([dl],[dlopen],,[ 57 AC_CHECK_LIB([dl],[dlopen],,[
58 AC_MSG_ERROR([no dlopen library found]) 58 AC_MSG_ERROR([no dlopen library found])
59 ]) 59 ])
60]) 60])
61 61
62AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 62AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
63 63
64WANT_DOXYGEN="yes" 64WANT_DOXYGEN="yes"
65AC_ARG_ENABLE([doxygen], 65AC_ARG_ENABLE([doxygen],
66 AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), 66 AC_HELP_STRING([--disable-doxygen],[do not generate documentation]),
67 [ 67 [
68 test "${enableval}" = "no" && WANT_DOXYGEN="no" 68 test "${enableval}" = "no" && WANT_DOXYGEN="no"
69 ] 69 ]
70) 70)
71if test "${WANT_DOXYGEN}" = "yes" ; then 71if test "${WANT_DOXYGEN}" = "yes" ; then
72 AC_WITH_DOXYGEN 72 AC_WITH_DOXYGEN
73 AC_WITH_DOT 73 AC_WITH_DOT
74else 74else
75 AM_CONDITIONAL([HAVE_DOXYGEN],[false]) 75 AM_CONDITIONAL([HAVE_DOXYGEN],[false])
76 AM_CONDITIONAL([HAVE_DOT],[false]) 76 AM_CONDITIONAL([HAVE_DOT],[false])
77fi 77fi
78 78
79AC_CONFIG_FILES([ 79AC_CONFIG_FILES([
80 Makefile 80 Makefile
81 Doxyfile 81 Doxyfile
82 sitecing.pc 82 sitecing.pc
83 include/Makefile 83 include/Makefile
84 lib/Makefile 84 lib/Makefile
85 share/Makefile 85 share/Makefile
86 src/Makefile 86 src/Makefile
87 components/Makefile 87 components/Makefile
88]) 88])
89AC_OUTPUT 89AC_OUTPUT
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
@@ -1,287 +1,287 @@
1#ifdef USE_PCH 1#ifdef USE_PCH
2 #include "pch.h" 2 #include "pch.h"
3#else 3#else
4 #include <sys/types.h> 4 #include <sys/types.h>
5 #include <sys/stat.h> 5 #include <sys/stat.h>
6 #include <unistd.h> 6 #include <unistd.h>
7 #include <sys/wait.h> 7 #include <sys/wait.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <iostream> 9 #include <iostream>
10 #include <fstream> 10 #include <fstream>
11 #include <stdexcept> 11 #include <stdexcept>
12 #include <vector> 12 #include <vector>
13 using namespace std; 13 using namespace std;
14 #include "sitecing/component_factory.h" 14 #include "sitecing/component_factory.h"
15 #include "sitecing/sitecing_util.h" 15 #include "sitecing/sitecing_util.h"
16 #include "sitecing/sitecing_parser.h" 16 #include "sitecing/sitecing_parser.h"
17 #include "sitecing/sitecing_exception.h" 17 #include "sitecing/sitecing_exception.h"
18#endif 18#endif
19 19
20namespace sitecing { 20namespace sitecing {
21 21
22 static const char *pp_targets[] = { ".cc", ".h", ".imports", ".classname", ".baseclassname", ".ancestors", ".pp_stamp" }; 22 static const char *pp_targets[] = { ".cc", ".h", ".imports", ".classname", ".baseclassname", ".ancestors", ".pp_stamp" };
23 static const char *cc_targets[] = { ".o", ".d" }; 23 static const char *cc_targets[] = { ".o", ".d" };
24 24
25 component_factory::component_factory(configuration& c) 25 component_factory::component_factory(configuration& c)
26 : config(c), 26 : config(c),
27 root_source(normalize_path(c.root_source,strip_trailing_slash)+'/'), 27 root_source(normalize_path(c.root_source,strip_trailing_slash)+'/'),
28 root_intermediate(normalize_path(c.root_intermediate,strip_trailing_slash)+'/'), 28 root_intermediate(normalize_path(c.root_intermediate,strip_trailing_slash)+'/'),
29 root_so(normalize_path(c.root_so,strip_trailing_slash)+'/') { 29 root_so(normalize_path(c.root_so,strip_trailing_slash)+'/') {
30 } 30 }
31 31
32 void component_factory::get_dependencies(const string& dst,file_list_t& deps) { 32 void component_factory::get_dependencies(const string& dst,file_list_t& deps) {
33 deps.clear(); 33 deps.clear();
34 string dp = normalize_path(dst,strip_trailing_slash); 34 string dp = normalize_path(dst,strip_trailing_slash);
35 // source documents 35 // source documents
36 try { // XXX: or just compare it off? 36 try { // XXX: or just compare it off?
37 string noro = strip_prefix(dp,root_source); 37 string noro = strip_prefix(dp,root_source);
38 return; 38 return;
39 }catch(utility_no_affix& una) { } 39 }catch(utility_no_affix& una) { }
40 // .so binaries 40 // .so binaries
41 try { 41 try {
42 string noso = strip_suffix(dp,".so"); 42 string noso = strip_suffix(dp,".so");
43 string noro = strip_prefix(noso,root_so); 43 string noro = strip_prefix(noso,root_so);
44 deps.push_back(root_intermediate+noro+".o"); 44 deps.push_back(root_intermediate+noro+".o");
45 config_options *co_so_deps = config.lookup_config(noro,config_options::flag_so_deps); 45 config_options *co_so_deps = config.lookup_config(noro,config_options::flag_so_deps);
46 if(co_so_deps) { 46 if(co_so_deps) {
47 for(list<string>::const_iterator i=co_so_deps->so_deps.begin();i!=co_so_deps->so_deps.end();++i) 47 for(list<string>::const_iterator i=co_so_deps->so_deps.begin();i!=co_so_deps->so_deps.end();++i)
48 deps.push_back(*i); 48 deps.push_back(*i);
49 } 49 }
50 return; 50 return;
51 }catch(utility_no_prefix& unp) { 51 }catch(utility_no_prefix& unp) {
52 throw konforka::exception(CODEPOINT,"component is outside of component root"); 52 throw konforka::exception(CODEPOINT,"component is outside of component root");
53 }catch(utility_no_suffix& uns) { } 53 }catch(utility_no_suffix& uns) { }
54 try { 54 try {
55 // preprocessor targets 55 // preprocessor targets
56 string noro = strip_prefix(dp,root_intermediate); 56 string noro = strip_prefix(dp,root_intermediate);
57 for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) { 57 for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
58 try { 58 try {
59 string nos = strip_suffix(noro,pp_targets[ppt]); 59 string nos = strip_suffix(noro,pp_targets[ppt]);
60 deps.push_back(root_source+nos); // depends on the source 60 deps.push_back(root_source+nos); // depends on the source
61 ifstream imports((root_intermediate+nos+".imports").c_str(),ios::in); 61 ifstream imports((root_intermediate+nos+".imports").c_str(),ios::in);
62 if(imports.good()) { 62 if(imports.good()) {
63 string str; 63 string str;
64 while(!imports.eof()) { 64 while(!imports.eof()) {
65 imports >> str; 65 imports >> str;
66 if(!str.empty()) 66 if(!str.empty())
67 deps.push_back(root_intermediate+str+".classname"); 67 deps.push_back(root_intermediate+str+".classname");
68 } 68 }
69 } 69 }
70 ifstream ancestors((root_intermediate+nos+".ancestors").c_str(),ios::in); 70 ifstream ancestors((root_intermediate+nos+".ancestors").c_str(),ios::in);
71 if(ancestors.good()) { 71 if(ancestors.good()) {
72 string str; 72 string str;
73 while(!ancestors.eof()) { 73 while(!ancestors.eof()) {
74 ancestors >> str; 74 ancestors >> str;
75 if(!str.empty()) 75 if(!str.empty())
76 deps.push_back(root_intermediate+str+".classname"); 76 deps.push_back(root_intermediate+str+".classname");
77 } 77 }
78 } 78 }
79 // XXX: intermediate_deps should be broken down 79 // XXX: intermediate_deps should be broken down
80 config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps); 80 config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
81 if(co_intermediate_deps) { 81 if(co_intermediate_deps) {
82 for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i) 82 for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
83 deps.push_back(*i); 83 deps.push_back(*i);
84 } 84 }
85 return; 85 return;
86 }catch(utility_no_suffix& uns) { } 86 }catch(utility_no_suffix& uns) { }
87 } 87 }
88 // compiler targets 88 // compiler targets
89 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) { 89 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
90 try { 90 try {
91 string nos = strip_suffix(noro,cc_targets[cct]); 91 string nos = strip_suffix(noro,cc_targets[cct]);
92 deps.push_back(root_intermediate+nos+".cc"); 92 deps.push_back(root_intermediate+nos+".cc");
93 config_options *co_cpp_deps = config.lookup_config(noro,config_options::flag_cpp_deps); 93 config_options *co_cpp_deps = config.lookup_config(noro,config_options::flag_cpp_deps);
94 if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) { 94 if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) {
95 ifstream df((root_intermediate+noro+".d").c_str(),ios::in); 95 ifstream df((root_intermediate+nos+".d").c_str(),ios::in);
96 if(df.good()) { 96 if(df.good()) {
97 string str; 97 string str;
98 while(!df.eof()) { 98 while(!df.eof()) {
99 df >> str; 99 df >> str;
100 if(str.find_first_of("\\:")==string::npos) 100 if(str.find_first_of("\\:")==string::npos)
101 deps.push_back(combine_path(config.root_source+nos,str)); 101 deps.push_back(combine_path(config.root_source+nos,str));
102 } 102 }
103 } 103 }
104 } 104 }
105 // XXX: intermediate_deps should be broken down 105 // XXX: intermediate_deps should be broken down
106 config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps); 106 config_options *co_intermediate_deps = config.lookup_config(nos,config_options::flag_intermediate_deps);
107 if(co_intermediate_deps) { 107 if(co_intermediate_deps) {
108 for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i) 108 for(list<string>::const_iterator i=co_intermediate_deps->intermediate_deps.begin();i!=co_intermediate_deps->intermediate_deps.end();++i)
109 deps.push_back(*i); 109 deps.push_back(*i);
110 } 110 }
111 }catch(utility_no_suffix& uns) { } 111 }catch(utility_no_suffix& uns) { }
112 } 112 }
113 }catch(utility_no_prefix& unp) { } 113 }catch(utility_no_prefix& unp) { }
114 } 114 }
115 115
116 bool component_factory::is_uptodate(const string& dst,file_list_t *deps) { 116 bool component_factory::is_uptodate(const string& dst,file_list_t *deps) {
117 string dp = normalize_path(dst,strip_trailing_slash); 117 string dp = normalize_path(dst,strip_trailing_slash);
118 try { 118 try {
119 string noro = strip_prefix(dp,root_intermediate); 119 string noro = strip_prefix(dp,root_intermediate);
120 for(int ppt=0;(ppt+1)<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) { 120 for(int ppt=0;(ppt+1)<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
121 try { 121 try {
122 string nos = strip_suffix(noro,pp_targets[ppt]); 122 string nos = strip_suffix(noro,pp_targets[ppt]);
123 return file_factory::is_uptodate(root_intermediate+nos+".pp_stamp",deps); 123 return file_factory::is_uptodate(root_intermediate+nos+".pp_stamp",deps);
124 }catch(utility_no_suffix& uns) { } 124 }catch(utility_no_suffix& uns) { }
125 } 125 }
126 bool rv = file_factory::is_uptodate(dst,deps); 126 bool rv = file_factory::is_uptodate(dst,deps);
127 return rv; 127 return rv;
128 }catch(utility_no_prefix& unp) { } 128 }catch(utility_no_prefix& unp) { }
129 // XXX: or just compare it off, instead of throwing things around. 129 // XXX: or just compare it off, instead of throwing things around.
130 try { 130 try {
131 strip_prefix(dp,root_so); 131 strip_prefix(dp,root_so);
132 return file_factory::is_uptodate(dst,deps); 132 return file_factory::is_uptodate(dst,deps);
133 }catch(utility_no_prefix& unp) { } 133 }catch(utility_no_prefix& unp) { }
134 return true; 134 return true;
135 } 135 }
136 136
137 void component_factory::build(const string& dst) { 137 void component_factory::build(const string& dst) {
138 string dp = normalize_path(dst,strip_trailing_slash); 138 string dp = normalize_path(dst,strip_trailing_slash);
139 // sources 139 // sources
140 try { 140 try {
141 string noro = strip_prefix(dp,root_source); 141 string noro = strip_prefix(dp,root_source);
142 // building the sources is left up to developer 142 // building the sources is left up to developer
143 return; 143 return;
144 }catch(utility_no_prefix& unp) { } 144 }catch(utility_no_prefix& unp) { }
145 // .so files 145 // .so files
146 try { 146 try {
147 string noso = strip_suffix(dp,".so"); 147 string noso = strip_suffix(dp,".so");
148 string noro = strip_prefix(noso,root_so); 148 string noro = strip_prefix(noso,root_so);
149 string o = root_intermediate+noro+".o"; 149 string o = root_intermediate+noro+".o";
150 cerr << "Linking " << noro << endl; 150 cerr << "Linking " << noro << endl;
151 if(access(o.c_str(),R_OK)) 151 if(access(o.c_str(),R_OK))
152 throw konforka::exception(CODEPOINT,string("can't access compiled component code (")+o+")"); 152 throw konforka::exception(CODEPOINT,string("can't access compiled component code (")+o+")");
153 make_path(dir_name(root_so+noro),0755); 153 make_path(dir_name(root_so+noro),0755);
154 file_lock lock_cc(root_intermediate+noro+".o.lock"); 154 file_lock lock_cc(root_intermediate+noro+".o.lock");
155 file_lock lock_so(root_so+noro+".so.lock"); 155 file_lock lock_so(root_so+noro+".so.lock");
156 int stdO = open((root_intermediate+noro+".ld.stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 156 int stdO = open((root_intermediate+noro+".ld.stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
157 if(stdO<0) 157 if(stdO<0)
158 throw konforka::exception(CODEPOINT,"failed to open/create linker stdout"); 158 throw konforka::exception(CODEPOINT,"failed to open/create linker stdout");
159 int stdE = open((root_intermediate+noro+".ld.stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 159 int stdE = open((root_intermediate+noro+".ld.stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
160 if(stdE<0) { 160 if(stdE<0) {
161 close(stdO); 161 close(stdO);
162 throw konforka::exception(CODEPOINT,"failed to open/create linker stderr"); 162 throw konforka::exception(CODEPOINT,"failed to open/create linker stderr");
163 } 163 }
164 list<string> args; 164 list<string> args;
165 config_options *co_ld_flags = config.lookup_config(noro,config_options::flag_ld_flags); 165 config_options *co_ld_flags = config.lookup_config(noro,config_options::flag_ld_flags);
166 if(co_ld_flags) { 166 if(co_ld_flags) {
167 args.insert(args.end(),co_ld_flags->ld_flags.begin(),co_ld_flags->ld_flags.end()); 167 args.insert(args.end(),co_ld_flags->ld_flags.begin(),co_ld_flags->ld_flags.end());
168 } 168 }
169 args.push_back("-shared"); 169 args.push_back("-shared");
170 args.push_back(o); 170 args.push_back(o);
171 file_list_t ancestors; 171 file_list_t ancestors;
172 get_ancestors(noro,ancestors); 172 get_ancestors(noro,ancestors);
173 for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) { 173 for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) {
174 string aso=root_so+*i+".so"; 174 string aso=root_so+*i+".so";
175 make(aso); 175 make(aso);
176 args.push_back(aso); 176 args.push_back(aso);
177 } 177 }
178 args.push_back("-o"); args.push_back(dp); 178 args.push_back("-o"); args.push_back(dp);
179 // TODO: "g++" configurable 179 // TODO: "g++" configurable
180 int rv = execute("g++",args,stdO,stdE); 180 int rv = execute("g++",args,stdO,stdE);
181 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) ) 181 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) )
182 throw link_error(CODEPOINT,"failed to link component",noro); 182 throw link_error(CODEPOINT,"failed to link component",noro);
183 return; 183 return;
184 }catch(utility_no_prefix& unp) { 184 }catch(utility_no_prefix& unp) {
185 throw konforka::exception(CODEPOINT,"component is outside of component root"); 185 throw konforka::exception(CODEPOINT,"component is outside of component root");
186 }catch(utility_no_suffix& uns) { } 186 }catch(utility_no_suffix& uns) { }
187 try { 187 try {
188 string noro = strip_prefix(dp,root_intermediate); 188 string noro = strip_prefix(dp,root_intermediate);
189 // compiler targets 189 // compiler targets
190 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) { 190 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
191 try { 191 try {
192 string nos = strip_suffix(noro,cc_targets[cct]); 192 string nos = strip_suffix(noro,cc_targets[cct]);
193 string cc = root_intermediate+nos+".cc"; 193 string cc = root_intermediate+nos+".cc";
194 string o = root_intermediate+nos+".o"; 194 string o = root_intermediate+nos+".o";
195 cerr << "Compiling " << nos << endl; 195 cerr << "Compiling " << nos << endl;
196 if(access(cc.c_str(),R_OK)) 196 if(access(cc.c_str(),R_OK))
197 throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")"); 197 throw konforka::exception(CODEPOINT,string("can't access preprocessed component code (")+cc+")");
198 make_path(dir_name(cc),0755); 198 make_path(dir_name(cc),0755);
199 string pwd = dir_name(root_source+nos); 199 string pwd = dir_name(root_source+nos);
200 auto_chdir dir_changer(pwd); 200 auto_chdir dir_changer(pwd);
201 file_lock lock_source(root_intermediate+nos+".lock"); 201 file_lock lock_source(root_intermediate+nos+".lock");
202 file_lock lock_cc(root_intermediate+nos+".o.lock"); 202 file_lock lock_cc(root_intermediate+nos+".o.lock");
203 int stdO = open((root_intermediate+nos+".stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 203 int stdO = open((root_intermediate+nos+".stdout").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
204 if(stdO<0) 204 if(stdO<0)
205 throw konforka::exception(CODEPOINT,"failed to open/create compiler stdout"); 205 throw konforka::exception(CODEPOINT,"failed to open/create compiler stdout");
206 int stdE = open((root_intermediate+nos+".stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664); 206 int stdE = open((root_intermediate+nos+".stderr").c_str(),O_CREAT|O_TRUNC|O_WRONLY,0664);
207 if(stdE<0) { 207 if(stdE<0) {
208 close(stdO); 208 close(stdO);
209 throw konforka::exception(CODEPOINT,"failed to open/create compiler's stderr"); 209 throw konforka::exception(CODEPOINT,"failed to open/create compiler's stderr");
210 } 210 }
211 list<string> args; 211 list<string> args;
212 config_options *co_cpp_flags = config.lookup_config(nos,config_options::flag_cpp_flags); 212 config_options *co_cpp_flags = config.lookup_config(nos,config_options::flag_cpp_flags);
213 if(co_cpp_flags) { 213 if(co_cpp_flags) {
214 args.insert(args.end(),co_cpp_flags->cpp_flags.begin(),co_cpp_flags->cpp_flags.end()); 214 args.insert(args.end(),co_cpp_flags->cpp_flags.begin(),co_cpp_flags->cpp_flags.end());
215 } 215 }
216 // TODO: maybe move it to separare config option like CoreCPPFLags? 216 // TODO: maybe move it to separare config option like CoreCPPFLags?
217 args.push_back("-I"+root_intermediate); 217 args.push_back("-I"+root_intermediate);
218 args.push_back("-I"+root_source); 218 args.push_back("-I"+root_source);
219 args.push_back("-MD"); args.push_back("-MF"); args.push_back(root_intermediate+nos+".d"); 219 args.push_back("-MD"); args.push_back("-MF"); args.push_back(root_intermediate+nos+".d");
220 args.push_back("-c"); 220 args.push_back("-c");
221 args.push_back(cc); 221 args.push_back(cc);
222 args.push_back("-o"); args.push_back(o); 222 args.push_back("-o"); args.push_back(o);
223 // TODO: "g++" configurable 223 // TODO: "g++" configurable
224 int rv = execute("g++",args,stdO,stdE); 224 int rv = execute("g++",args,stdO,stdE);
225 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) ) 225 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) )
226 throw compile_error(CODEPOINT,"failed to compile component",nos); 226 throw compile_error(CODEPOINT,"failed to compile component",nos);
227 return; 227 return;
228 }catch(utility_no_suffix& uns) { } 228 }catch(utility_no_suffix& uns) { }
229 } 229 }
230 // preprocessor targets 230 // preprocessor targets
231 for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) { 231 for(int ppt=0;ppt<sizeof(pp_targets)/sizeof(*pp_targets);ppt++) {
232 try { 232 try {
233 string nos = strip_suffix(noro,pp_targets[ppt]); 233 string nos = strip_suffix(noro,pp_targets[ppt]);
234 string src = root_source+nos; 234 string src = root_source+nos;
235 cerr << "Preprocessing " << nos << endl; 235 cerr << "Preprocessing " << nos << endl;
236 if(access(src.c_str(),R_OK)) 236 if(access(src.c_str(),R_OK))
237 throw konforka::exception(CODEPOINT,string("can't access component source (")+src+")"); 237 throw konforka::exception(CODEPOINT,string("can't access component source (")+src+")");
238 make_path(dir_name(root_intermediate+nos),0755); 238 make_path(dir_name(root_intermediate+nos),0755);
239 file_lock lock(root_intermediate+nos+".lock"); 239 file_lock lock(root_intermediate+nos+".lock");
240 sitecing_parser parser(*this); 240 sitecing_parser parser(*this);
241 config_options *co_skeleton = config.lookup_config(nos,config_options::flag_skeleton); 241 config_options *co_skeleton = config.lookup_config(nos,config_options::flag_skeleton);
242 if(co_skeleton) 242 if(co_skeleton)
243 parser.skeleton = co_skeleton->skeleton; 243 parser.skeleton = co_skeleton->skeleton;
244 static const char *id_chars = "abcdefghijklmnopqrstuvwxyz0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZ"; 244 static const char *id_chars = "abcdefghijklmnopqrstuvwxyz0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZ";
245 parser.class_name = normalize_path(nos,strip_leading_slash|strip_trailing_slash); 245 parser.class_name = normalize_path(nos,strip_leading_slash|strip_trailing_slash);
246 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)) { 246 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)) {
247 string::size_type lc = parser.class_name.find_first_of(id_chars,illc); 247 string::size_type lc = parser.class_name.find_first_of(id_chars,illc);
248 int n = ((lc==string::npos)?parser.class_name.length():lc)-illc; 248 int n = ((lc==string::npos)?parser.class_name.length():lc)-illc;
249 parser.class_name.replace(illc,n,n,'_'); 249 parser.class_name.replace(illc,n,n,'_');
250 } 250 }
251 parser.class_name = "_SCC_"+parser.class_name; 251 parser.class_name = "_SCC_"+parser.class_name;
252 parser.output_basename = root_intermediate+nos; 252 parser.output_basename = root_intermediate+nos;
253 parser.component_basename = nos; 253 parser.component_basename = nos;
254 try { 254 try {
255 parser.preprocess(src); 255 parser.preprocess(src);
256 string sf = root_intermediate+nos+".pp_stamp"; 256 string sf = root_intermediate+nos+".pp_stamp";
257 ofstream sfs(sf.c_str(),ios::trunc|ios::out); // touch .pp_stamp 257 ofstream sfs(sf.c_str(),ios::trunc|ios::out); // touch .pp_stamp
258 }catch(preprocessor_error& pe) { 258 }catch(preprocessor_error& pe) {
259 pe.component_name = nos; 259 pe.component_name = nos;
260 pe.see(CODEPOINT); 260 pe.see(CODEPOINT);
261 throw; 261 throw;
262 } 262 }
263 return; 263 return;
264 }catch(utility_no_suffix& uns) { } 264 }catch(utility_no_suffix& uns) { }
265 } 265 }
266 }catch(utility_no_prefix& unp) { } 266 }catch(utility_no_prefix& unp) { }
267 cerr << "ignoring build request for " << dp << endl; 267 cerr << "ignoring build request for " << dp << endl;
268 } 268 }
269 269
270 void component_factory::make(const string& dst) { 270 void component_factory::make(const string& dst) {
271 string dp = normalize_path(dst,strip_trailing_slash); 271 string dp = normalize_path(dst,strip_trailing_slash);
272 try { 272 try {
273 string noso = strip_suffix(dp,".so"); 273 string noso = strip_suffix(dp,".so");
274 string noro = strip_prefix(noso,root_so); 274 string noro = strip_prefix(noso,root_so);
275 file_list_t a; 275 file_list_t a;
276 get_ancestors(noro,a); 276 get_ancestors(noro,a);
277 for(file_list_t::const_iterator i=a.begin();i!=a.end();++i) { 277 for(file_list_t::const_iterator i=a.begin();i!=a.end();++i) {
278 make(root_so+*i+".so"); 278 make(root_so+*i+".so");
279 } 279 }
280 }catch(utility_no_affix& una) { } 280 }catch(utility_no_affix& una) { }
281 file_factory::make(dst); 281 file_factory::make(dst);
282 } 282 }
283 283
284 int component_factory::execute(const string& cmd, const list<string>& args,int stdo,int stde) { 284 int component_factory::execute(const string& cmd, const list<string>& args,int stdo,int stde) {
285 // XXX: is it right that we do stdio/stderr tricks outside of the function? 285 // XXX: is it right that we do stdio/stderr tricks outside of the function?
286 // cerr << "executing: " << cmd; 286 // cerr << "executing: " << cmd;
287 vector<const char*> argv(args.size()+2); 287 vector<const char*> argv(args.size()+2);
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 @@
1#ifdef USE_PCH 1#ifdef USE_PCH
2 #include "pch.h" 2 #include "pch.h"
3#else 3#else
4 #include <sys/types.h> 4 #include <sys/types.h>
5 #include <sys/stat.h> 5 #include <sys/stat.h>
6 #include <unistd.h> 6 #include <unistd.h>
7 #include <konforka/exception.h> 7 #include <konforka/exception.h>
8 using namespace std; 8 using namespace std;
9 #include "sitecing/file_factory.h" 9 #include "sitecing/file_factory.h"
10#endif 10#endif
11 11
12namespace sitecing { 12namespace sitecing {
13 13
14 bool file_factory::is_uptodate(const string& dst,file_list_t* deps) { 14 bool file_factory::is_uptodate(const string& dst,file_list_t* deps) {
15 file_list_t deplist; 15 file_list_t deplist;
16 file_list_t *fl = deps?deps:&deplist; 16 file_list_t *fl = deps?deps:&deplist;
17 get_dependencies(dst,*fl); 17 get_dependencies(dst,*fl);
18 struct stat stdst; 18 struct stat stdst;
19 if(stat(dst.c_str(),&stdst)) 19 if(stat(dst.c_str(),&stdst))
20 return false; 20 return false;
21 for(file_list_t::const_iterator i=fl->begin();i!=fl->end();i++) { 21 for(file_list_t::const_iterator i=fl->begin();i!=fl->end();++i) {
22 struct stat stdep; 22 struct stat stdep;
23 if(stat(i->c_str(),&stdep)) 23 if(stat(i->c_str(),&stdep))
24 return false; 24 return false;
25 if(stdst.st_mtime<stdep.st_mtime) 25 if(stdst.st_mtime<stdep.st_mtime)
26 return false; 26 return false;
27 if(!is_uptodate(*i)) 27 if(!is_uptodate(*i))
28 return false; 28 return false;
29 } 29 }
30 return true; 30 return true;
31 } 31 }
32 32
33 void file_factory::make(const string& dst) { 33 void file_factory::make(const string& dst) {
34 try { 34 try {
35 depth++; 35 depth++;
36 if(depth>25) 36 if(depth>25)
37 throw konforka::exception(CODEPOINT,"recursed too deeply."); 37 throw konforka::exception(CODEPOINT,"recursed too deeply.");
38 file_list_t deps; 38 file_list_t deps;
39 if(!is_uptodate(dst,&deps)) { 39 if(!is_uptodate(dst,&deps)) {
40 for(file_list_t::const_iterator i=deps.begin();i!=deps.end();i++) 40 for(file_list_t::const_iterator i=deps.begin();i!=deps.end();i++)
41 make(*i); 41 make(*i);
42 if(!is_uptodate(dst,&deps)) 42 if(!is_uptodate(dst,&deps))
43 build(dst); 43 build(dst);
44 } 44 }
45 depth--; 45 depth--;
46 }catch(konforka::exception& ke) { 46 }catch(konforka::exception& ke) {
47 depth--; 47 depth--;
48 ke.see(CODEPOINT); 48 ke.see(CODEPOINT);
49 throw; 49 throw;
50 }catch(...) { 50 }catch(...) {
51 depth--; 51 depth--;
52 throw; 52 throw;
53 } 53 }
54 } 54 }
55 55
56} 56}
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
@@ -1,325 +1,328 @@
1#include <sys/types.h> 1#include <sys/types.h>
2#include <unistd.h> 2#include <unistd.h>
3#include <signal.h> 3#include <signal.h>
4#include <getopt.h> 4#include <getopt.h>
5#include <pwd.h> 5#include <pwd.h>
6#include <grp.h> 6#include <grp.h>
7#include <errno.h> 7#include <errno.h>
8#include <syslog.h> 8#include <syslog.h>
9#include <iostream> 9#include <iostream>
10#include <memory> 10#include <memory>
11#include <typeinfo> 11#include <typeinfo>
12using namespace std; 12using namespace std;
13#include "kingate/fastcgi.h" 13#include "kingate/fastcgi.h"
14#include "kingate/cgi_gateway.h" 14#include "kingate/cgi_gateway.h"
15using namespace kingate; 15using namespace kingate;
16#include "sitecing/sitecing_util.h" 16#include "sitecing/sitecing_util.h"
17#include "sitecing/util.h" 17#include "sitecing/util.h"
18#include "sitecing/sitespace.h" 18#include "sitecing/sitespace.h"
19#include "sitecing/sitecing_interface_cgi.h" 19#include "sitecing/sitecing_interface_cgi.h"
20#include "sitecing/cgi_component.h" 20#include "sitecing/cgi_component.h"
21#include "sitecing/configuration.h" 21#include "sitecing/configuration.h"
22#include "sitecing/magic.h" 22#include "sitecing/magic.h"
23#include "sitecing/sitecing_exception.h" 23#include "sitecing/sitecing_exception.h"
24#include "sitecing/exception.h" 24#include "sitecing/exception.h"
25#include "sitecing/process_manager.h" 25#include "sitecing/process_manager.h"
26using namespace sitecing; 26using namespace sitecing;
27 27
28#include "config.h" 28#include "config.h"
29#define PHEADER PACKAGE " Version " VERSION 29#define PHEADER PACKAGE " Version " VERSION
30#define PCOPY "Copyright (c) 2004 Klever Group" 30#define PCOPY "Copyright (c) 2004 Klever Group"
31 31
32class cdummyClass : public acomponent { 32class cdummyClass : public acomponent {
33 public: 33 public:
34 void main(int _magic,va_list _args) {} 34 void main(int _magic,va_list _args) {}
35 void *__the_most_derived_this() { return NULL; } 35 void *__the_most_derived_this() { return NULL; }
36} cdummyInstance; 36} cdummyInstance;
37class adummyClass : public cgi_component { 37class adummyClass : public cgi_component {
38 public: 38 public:
39 void main(int _magic,va_list _args) {} 39 void main(int _magic,va_list _args) {}
40 void *__the_most_derived_this() { return NULL; } 40 void *__the_most_derived_this() { return NULL; }
41} adummyInstance; 41} adummyInstance;
42 42
43class sitecing_fastcgi_pm : public process_manager { 43class sitecing_fastcgi_pm : public process_manager {
44 public: 44 public:
45 configuration config; 45 configuration config;
46 fcgi_socket *fss; 46 fcgi_socket *fss;
47 semaphore sem; 47 semaphore sem;
48 bool multi; 48 bool multi;
49 uid_t uid; 49 uid_t uid;
50 gid_t gid; 50 gid_t gid;
51 pid_file pidfile; 51 pid_file pidfile;
52 52
53 sitecing_fastcgi_pm(const string& config_file); 53 sitecing_fastcgi_pm(const string& config_file);
54 ~sitecing_fastcgi_pm(); 54 ~sitecing_fastcgi_pm();
55 55
56 void process(int slot); 56 void process(int slot);
57 57
58 void run(); 58 void run();
59 void give_up_privs(); 59 void give_up_privs();
60}; 60};
61 61
62sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file) 62sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file)
63 : config(config_file), multi(false) { 63 : config(config_file), multi(false) {
64 if(( (config.flags&configuration::flag_user) || (config.flags&configuration::flag_group) || (config.flags&configuration::flag_chroot) ) && geteuid() ) 64 if(( (config.flags&configuration::flag_user) || (config.flags&configuration::flag_group) || (config.flags&configuration::flag_chroot) ) && geteuid() )
65 throw konforka::exception(CODEPOINT,"can't use User, Group or Chroot when started without root privileges"); 65 throw konforka::exception(CODEPOINT,"can't use User, Group or Chroot when started without root privileges");
66 if(config.flags&configuration::flag_user) { 66 if(config.flags&configuration::flag_user) {
67 struct passwd *ptmp = getpwnam(config.user.c_str()); 67 struct passwd *ptmp = getpwnam(config.user.c_str());
68 if(ptmp) { 68 if(ptmp) {
69 uid = ptmp->pw_uid; 69 uid = ptmp->pw_uid;
70 }else{ 70 }else{
71 errno=0; 71 errno=0;
72 uid = strtol(config.user.c_str(),NULL,0); 72 uid = strtol(config.user.c_str(),NULL,0);
73 if(errno) 73 if(errno)
74 throw konforka::exception(CODEPOINT,"failed to resolve User value to uid"); 74 throw konforka::exception(CODEPOINT,"failed to resolve User value to uid");
75 } 75 }
76 } 76 }
77 if(config.flags&configuration::flag_group) { 77 if(config.flags&configuration::flag_group) {
78 struct group *gtmp = getgrnam(config.group.c_str()); 78 struct group *gtmp = getgrnam(config.group.c_str());
79 if(gtmp) { 79 if(gtmp) {
80 gid = gtmp->gr_gid; 80 gid = gtmp->gr_gid;
81 }else{ 81 }else{
82 errno=0; 82 errno=0;
83 gid = strtol(config.group.c_str(),NULL,0); 83 gid = strtol(config.group.c_str(),NULL,0);
84 if(errno) 84 if(errno)
85 throw konforka::exception(CODEPOINT,"failed to resolve Group value to gid"); 85 throw konforka::exception(CODEPOINT,"failed to resolve Group value to gid");
86 } 86 }
87 } 87 }
88 if(!(config.flags&configuration::flag_root_source)) 88 if(!(config.flags&configuration::flag_root_source))
89 throw konforka::exception(CODEPOINT,"unspecified root for sources"); 89 throw konforka::exception(CODEPOINT,"unspecified root for sources");
90 if(!(config.flags&configuration::flag_root_intermediate)) 90 if(!(config.flags&configuration::flag_root_intermediate))
91 throw konforka::exception(CODEPOINT,"unspecified root for intermediate files"); 91 throw konforka::exception(CODEPOINT,"unspecified root for intermediate files");
92 if(!(config.flags&configuration::flag_root_so)) 92 if(!(config.flags&configuration::flag_root_so))
93 throw konforka::exception(CODEPOINT,"unspecified root for shared objects"); 93 throw konforka::exception(CODEPOINT,"unspecified root for shared objects");
94 if(config.flags&configuration::flag_min_children) 94 if(config.flags&configuration::flag_min_children)
95 min_children = config.min_children; 95 min_children = config.min_children;
96 if(config.flags&configuration::flag_max_children) 96 if(config.flags&configuration::flag_max_children)
97 max_children = config.max_children; 97 max_children = config.max_children;
98 if(config.flags&configuration::flag_min_spare_children) 98 if(config.flags&configuration::flag_min_spare_children)
99 min_spare_children = config.min_spare_children; 99 min_spare_children = config.min_spare_children;
100 if(config.flags&configuration::flag_max_spare_children) 100 if(config.flags&configuration::flag_max_spare_children)
101 max_spare_children = config.max_spare_children; 101 max_spare_children = config.max_spare_children;
102 if(max_children<min_spare_children) 102 if(max_children<min_spare_children)
103 throw konforka::exception(CODEPOINT,"inconsistent numbers of MaxChildren and MinSpareChildren"); 103 throw konforka::exception(CODEPOINT,"inconsistent numbers of MaxChildren and MinSpareChildren");
104 if(min_children>max_spare_children && max_spare_children>=0) 104 if(min_children>max_spare_children && max_spare_children>=0)
105 throw konforka::exception(CODEPOINT,"inconsistent numbers of MinChildren and MaxSpareChildren"); 105 throw konforka::exception(CODEPOINT,"inconsistent numbers of MinChildren and MaxSpareChildren");
106 if(config.flags&configuration::flag_multi_process) { 106 if(config.flags&configuration::flag_multi_process) {
107 multi = config.multi_process; 107 multi = config.multi_process;
108 }else{ 108 }else{
109 if(config.flags&configuration::flag_listen_socket) 109 if(config.flags&configuration::flag_listen_socket)
110 multi = true; 110 multi = true;
111 else 111 else
112 multi = false; 112 multi = false;
113 } 113 }
114 fss = (config.flags&configuration::flag_listen_socket)?new fcgi_socket(config.listen_socket.c_str(),5):new fcgi_socket(0); 114 fss = (config.flags&configuration::flag_listen_socket)?new fcgi_socket(config.listen_socket.c_str(),5):new fcgi_socket(0);
115 if(!fss) 115 if(!fss)
116 throw konforka::exception(CODEPOINT,"failed to establish listening socket"); 116 throw konforka::exception(CODEPOINT,"failed to establish listening socket");
117 if(config.flags&configuration::flag_daemonize && config.daemonize) { 117 if(config.flags&configuration::flag_daemonize && config.daemonize) {
118 pid_t pf = fork(); 118 pid_t pf = fork();
119 if(pf<0) 119 if(pf<0)
120 throw konforka::exception(CODEPOINT,"failed to fork()"); 120 throw konforka::exception(CODEPOINT,"failed to fork()");
121 if(pf) { 121 if(pf) {
122 die_humbly=true; 122 die_humbly=true;
123 _exit(0); 123 _exit(0);
124 } 124 }
125 } 125 }
126 if(config.flags&configuration::flag_pid_file) { 126 if(config.flags&configuration::flag_pid_file) {
127 pidfile.set(config.pid_file); 127 pidfile.set(config.pid_file);
128 } 128 }
129 if(multi) 129 if(multi)
130 sem.init(); 130 sem.init();
131 } 131 }
132sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { 132sitecing_fastcgi_pm::~sitecing_fastcgi_pm() {
133 if(fss) 133 if(fss)
134 delete fss; 134 delete fss;
135} 135}
136 136
137void sitecing_fastcgi_pm::process(int slot) { 137void sitecing_fastcgi_pm::process(int slot) {
138 signal(SIGINT,SIG_DFL); 138 signal(SIGINT,SIG_DFL);
139 signal(SIGABRT,SIG_DFL); 139 signal(SIGABRT,SIG_DFL);
140 signal(SIGTERM,SIG_DFL); 140 signal(SIGTERM,SIG_DFL);
141 give_up_privs(); 141 give_up_privs();
142 scoreboard_slot *sslot = sboard.get_slot(slot); 142 scoreboard_slot *sslot = sboard.get_slot(slot);
143 try { 143 try {
144 sitespace ss(config); 144 sitespace ss(config);
145 fcgi_socket& fs = *fss; 145 fcgi_socket& fs = *fss;
146 sitecing_interface_cgi scif(&ss); 146 sitecing_interface_cgi scif(&ss);
147 string component_path; 147 string component_path;
148 string action; 148 string action;
149 config_options::action_handler_t *action_handler; 149 config_options::action_handler_t *action_handler;
150 int rpc = 0; 150 int rpc = 0;
151 if(config.flags&configuration::flag_requests_per_child) 151 if(config.flags&configuration::flag_requests_per_child)
152 rpc = config.requests_per_child; 152 rpc = config.requests_per_child;
153 for(int req=0;(rpc<=0) || (req<rpc);rpc++) { 153 for(int req=0;(rpc<=0) || (req<rpc);rpc++) {
154 semaphore_lock sl; 154 semaphore_lock sl;
155 if(multi) { 155 if(multi) {
156 sslot->state = scoreboard_slot::state_idle; 156 sslot->state = scoreboard_slot::state_idle;
157 sl.sem = &sem; 157 sl.sem = &sem;
158 sl.lock(); 158 sl.lock();
159 } 159 }
160 sslot->state = scoreboard_slot::state_accept; 160 sslot->state = scoreboard_slot::state_accept;
161 fcgi_interface fi(fs); 161 fcgi_interface fi(fs);
162 sslot->state = scoreboard_slot::state_processing; 162 sslot->state = scoreboard_slot::state_processing;
163 if(multi) 163 if(multi)
164 sl.unlock(); 164 sl.unlock();
165 cgi_gateway gw(fi); 165 cgi_gateway gw(fi);
166 scif.prepare(&gw); 166 scif.prepare(&gw);
167 try { 167 try {
168 component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); 168 component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
169 string full_component_path; 169 string full_component_path;
170 string sitecing_path_info;
170 while(true) { 171 while(true) {
171 full_component_path = config.root_source+'/'+component_path; 172 full_component_path = config.root_source+'/'+component_path;
172 if(!access(full_component_path.c_str(),F_OK)) 173 if(!access(full_component_path.c_str(),F_OK))
173 break; 174 break;
174 string::size_type sl = component_path.rfind('/'); 175 string::size_type sl = component_path.rfind('/');
175 if(sl==string::npos) 176 if(sl==string::npos)
176 throw konforka::exception(CODEPOINT,"can't find the target component"); 177 throw konforka::exception(CODEPOINT,"can't find the target component");
178 sitecing_path_info.insert(0,component_path,sl,string::npos);
177 component_path.erase(sl); 179 component_path.erase(sl);
178 } 180 }
181 fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
179 action = component_path; 182 action = component_path;
180 action_handler = config.lookup_action_handler(component_path); 183 action_handler = config.lookup_action_handler(component_path);
181 if(action_handler) { 184 if(action_handler) {
182 action = action_handler->action; 185 action = action_handler->action;
183 } 186 }
184 string pwd = dir_name(full_component_path); 187 string pwd = dir_name(full_component_path);
185 if(chdir(pwd.c_str())) 188 if(chdir(pwd.c_str()))
186 throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); 189 throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
187 so_component soc = ss.fetch(action,&scif); 190 so_component soc = ss.fetch(action,&scif);
188 if(action_handler) { 191 if(action_handler) {
189 soc.ac->run(__magic_action, 192 soc.ac->run(__magic_action,
190 config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), 193 config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
191 &(action_handler->args) 194 &(action_handler->args)
192 ); 195 );
193 }else{ 196 }else{
194 soc.ac->main(0,NULL); 197 soc.ac->main(0,NULL);
195 } 198 }
196 }catch(http_status& hs) { 199 }catch(http_status& hs) {
197 scif.headers["Status"] = hs.status+" "+hs.message; 200 scif.headers["Status"] = hs.status+" "+hs.message;
198 string hshp = config.lookup_http_status_handler(component_path,hs.status); 201 string hshp = config.lookup_http_status_handler(component_path,hs.status);
199 if(!hshp.empty()) { 202 if(!hshp.empty()) {
200 so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status 203 so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
201 hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), 204 hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
202 config.root_so.c_str(),action.c_str(),&hs); 205 config.root_so.c_str(),action.c_str(),&hs);
203 } 206 }
204 }catch(compile_error& ce) { 207 }catch(compile_error& ce) {
205 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); 208 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
206 if(co_exception_handler) { 209 if(co_exception_handler) {
207 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. 210 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
208 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()); 211 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());
209 }else{ 212 }else{
210 ce.see(CODEPOINT); 213 ce.see(CODEPOINT);
211 throw; 214 throw;
212 } 215 }
213 }catch(preprocessor_error& pe) { 216 }catch(preprocessor_error& pe) {
214 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); 217 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
215 if(co_exception_handler) { 218 if(co_exception_handler) {
216 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. 219 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
217 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); 220 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);
218 }else{ 221 }else{
219 pe.see(CODEPOINT); 222 pe.see(CODEPOINT);
220 throw; 223 throw;
221 } 224 }
222 }catch(exception& e) { 225 }catch(exception& e) {
223 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); 226 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
224 if(co_exception_handler) { 227 if(co_exception_handler) {
225 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. 228 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
226 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); 229 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);
227 } 230 }
228 } 231 }
229 scif.flush(); 232 scif.flush();
230 } 233 }
231 }catch(exception& e) { 234 }catch(exception& e) {
232 cerr << "->Oops: " << e.what() << endl; 235 cerr << "->Oops: " << e.what() << endl;
233 } 236 }
234} 237}
235 238
236void sitecing_fastcgi_pm::run() { 239void sitecing_fastcgi_pm::run() {
237 if(multi) 240 if(multi)
238 manage(); 241 manage();
239 else 242 else
240 process(0); 243 process(0);
241} 244}
242 245
243void sitecing_fastcgi_pm::give_up_privs() { 246void sitecing_fastcgi_pm::give_up_privs() {
244 if(config.flags&configuration::flag_chroot) { 247 if(config.flags&configuration::flag_chroot) {
245 if(chroot(config.chroot.c_str())) 248 if(chroot(config.chroot.c_str()))
246 throw konforka::exception(CODEPOINT,"failed to chroot()"); 249 throw konforka::exception(CODEPOINT,"failed to chroot()");
247 } 250 }
248 if(config.flags&configuration::flag_group) { 251 if(config.flags&configuration::flag_group) {
249 if((getgid()!=gid) && setgid(gid)) 252 if((getgid()!=gid) && setgid(gid))
250 throw konforka::exception(CODEPOINT,"failed to setgid()"); 253 throw konforka::exception(CODEPOINT,"failed to setgid()");
251 } 254 }
252 if(config.flags&configuration::flag_user) { 255 if(config.flags&configuration::flag_user) {
253 if((getuid()!=uid) && setuid(uid)) 256 if((getuid()!=uid) && setuid(uid))
254 throw konforka::exception(CODEPOINT,"failed to setuid()"); 257 throw konforka::exception(CODEPOINT,"failed to setuid()");
255 } 258 }
256} 259}
257 260
258static sitecing_fastcgi_pm* _process_manager = NULL; 261static sitecing_fastcgi_pm* _process_manager = NULL;
259 262
260static void lethal_signal_handler(int signum) { 263static void lethal_signal_handler(int signum) {
261 _process_manager->finishing=true; 264 _process_manager->finishing=true;
262} 265}
263 266
264int main(int argc,char **argv) { 267int main(int argc,char **argv) {
265 const char* id = *argv; 268 const char* id = *argv;
266 const char* t; 269 const char* t;
267 while(t = index(id,'/')) { 270 while(t = index(id,'/')) {
268 id=t; id++; 271 id=t; id++;
269 } 272 }
270 openlog(id,LOG_PERROR|LOG_PID,LOG_USER); 273 openlog(id,LOG_PERROR|LOG_PID,LOG_USER);
271 try { 274 try {
272 string config_file = "sitecing.conf"; 275 string config_file = "sitecing.conf";
273 while(true) { 276 while(true) {
274 static struct option opts[] = { 277 static struct option opts[] = {
275 { "help", no_argument, 0, 'h' }, 278 { "help", no_argument, 0, 'h' },
276 { "usage", no_argument, 0, 'h' }, 279 { "usage", no_argument, 0, 'h' },
277 { "version", no_argument, 0, 'V' }, 280 { "version", no_argument, 0, 'V' },
278 { "license", no_argument, 0, 'L' }, 281 { "license", no_argument, 0, 'L' },
279 { "config", required_argument, 0, 'f' }, 282 { "config", required_argument, 0, 'f' },
280 { NULL, 0, 0, 0 } 283 { NULL, 0, 0, 0 }
281 }; 284 };
282 int c = getopt_long(argc,argv,"f:hVL",opts,NULL); 285 int c = getopt_long(argc,argv,"f:hVL",opts,NULL);
283 if(c==-1) 286 if(c==-1)
284 break; 287 break;
285 switch(c) { 288 switch(c) {
286 case 'h': 289 case 'h':
287 cerr << PHEADER << endl 290 cerr << PHEADER << endl
288 << PCOPY << endl << endl 291 << PCOPY << endl << endl
289 << " -h, --help" << endl 292 << " -h, --help" << endl
290 << " --usage display this text" << endl 293 << " --usage display this text" << endl
291 << " -V, --version display version number" << endl 294 << " -V, --version display version number" << endl
292 << " -L, --license show license" << endl 295 << " -L, --license show license" << endl
293 << " -f filename, --config=filename" << endl 296 << " -f filename, --config=filename" << endl
294 << " specify configuration file to use" << endl; 297 << " specify configuration file to use" << endl;
295 exit(0); 298 exit(0);
296 break; 299 break;
297 case 'V': 300 case 'V':
298 cerr << VERSION << endl; 301 cerr << VERSION << endl;
299 exit(0); 302 exit(0);
300 break; 303 break;
301 case 'L': 304 case 'L':
302 extern const char *COPYING; 305 extern const char *COPYING;
303 cerr << COPYING << endl; 306 cerr << COPYING << endl;
304 exit(0); 307 exit(0);
305 break; 308 break;
306 case 'f': 309 case 'f':
307 config_file = optarg; 310 config_file = optarg;
308 break; 311 break;
309 default: 312 default:
310 cerr << "Huh??" << endl; 313 cerr << "Huh??" << endl;
311 break; 314 break;
312 } 315 }
313 } 316 }
314 sitecing_fastcgi_pm sfpm(config_file); 317 sitecing_fastcgi_pm sfpm(config_file);
315 _process_manager = &sfpm; 318 _process_manager = &sfpm;
316 signal(SIGINT,lethal_signal_handler); 319 signal(SIGINT,lethal_signal_handler);
317 signal(SIGABRT,lethal_signal_handler); 320 signal(SIGABRT,lethal_signal_handler);
318 signal(SIGTERM,lethal_signal_handler); 321 signal(SIGTERM,lethal_signal_handler);
319 sfpm.run(); 322 sfpm.run();
320 }catch(exception& e) { 323 }catch(exception& e) {
321 /* cerr << "Oops: " << e.what() << endl; */ 324 /* cerr << "Oops: " << e.what() << endl; */
322 syslog(LOG_ERR,"uncaught exception: %s",e.what()); 325 syslog(LOG_ERR,"uncaught exception: %s",e.what());
323 } 326 }
324 closelog(); 327 closelog();
325} 328}
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
@@ -1,178 +1,181 @@
1#include <sys/types.h> 1#include <sys/types.h>
2#include <unistd.h> 2#include <unistd.h>
3#include <signal.h> 3#include <signal.h>
4#include <getopt.h> 4#include <getopt.h>
5#include <pwd.h> 5#include <pwd.h>
6#include <grp.h> 6#include <grp.h>
7#include <errno.h> 7#include <errno.h>
8#include <syslog.h> 8#include <syslog.h>
9#include <iostream> 9#include <iostream>
10#include <memory> 10#include <memory>
11#include <typeinfo> 11#include <typeinfo>
12using namespace std; 12using namespace std;
13#include "kingate/plaincgi.h" 13#include "kingate/plaincgi.h"
14#include "kingate/cgi_gateway.h" 14#include "kingate/cgi_gateway.h"
15using namespace kingate; 15using namespace kingate;
16#include "sitecing/sitecing_util.h" 16#include "sitecing/sitecing_util.h"
17#include "sitecing/util.h" 17#include "sitecing/util.h"
18#include "sitecing/sitespace.h" 18#include "sitecing/sitespace.h"
19#include "sitecing/sitecing_interface_cgi.h" 19#include "sitecing/sitecing_interface_cgi.h"
20#include "sitecing/cgi_component.h" 20#include "sitecing/cgi_component.h"
21#include "sitecing/configuration.h" 21#include "sitecing/configuration.h"
22#include "sitecing/magic.h" 22#include "sitecing/magic.h"
23#include "sitecing/sitecing_exception.h" 23#include "sitecing/sitecing_exception.h"
24#include "sitecing/exception.h" 24#include "sitecing/exception.h"
25using namespace sitecing; 25using namespace sitecing;
26 26
27#include "config.h" 27#include "config.h"
28#define PHEADER PACKAGE " Version " VERSION 28#define PHEADER PACKAGE " Version " VERSION
29#define PCOPY "Copyright (c) 2005 Klever Group" 29#define PCOPY "Copyright (c) 2005 Klever Group"
30 30
31class cdummyClass : public acomponent { 31class cdummyClass : public acomponent {
32 public: 32 public:
33 void main(int _magic,va_list _args) {} 33 void main(int _magic,va_list _args) {}
34 void *__the_most_derived_this() { return NULL; } 34 void *__the_most_derived_this() { return NULL; }
35} cdummyInstance; 35} cdummyInstance;
36class adummyClass : public cgi_component { 36class adummyClass : public cgi_component {
37 public: 37 public:
38 void main(int _magic,va_list _args) {} 38 void main(int _magic,va_list _args) {}
39 void *__the_most_derived_this() { return NULL; } 39 void *__the_most_derived_this() { return NULL; }
40} adummyInstance; 40} adummyInstance;
41 41
42void process_request(configuration& config) { 42void process_request(configuration& config) {
43 try { 43 try {
44 sitespace ss(config); 44 sitespace ss(config);
45 sitecing_interface_cgi scif(&ss); 45 sitecing_interface_cgi scif(&ss);
46 string component_path; 46 string component_path;
47 string action; 47 string action;
48 config_options::action_handler_t *action_handler; 48 config_options::action_handler_t *action_handler;
49 plaincgi_interface ci; 49 plaincgi_interface ci;
50 cgi_gateway gw(ci); 50 cgi_gateway gw(ci);
51 scif.prepare(&gw); 51 scif.prepare(&gw);
52 try { 52 try {
53 component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); 53 component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
54 string full_component_path; 54 string full_component_path;
55 string sitecing_path_info;
55 while(true) { 56 while(true) {
56 full_component_path = config.root_source+'/'+component_path; 57 full_component_path = config.root_source+'/'+component_path;
57 if(!access(full_component_path.c_str(),F_OK)) 58 if(!access(full_component_path.c_str(),F_OK))
58 break; 59 break;
59 string::size_type sl = component_path.rfind('/'); 60 string::size_type sl = component_path.rfind('/');
60 if(sl==string::npos) 61 if(sl==string::npos)
61 throw konforka::exception(CODEPOINT,"can't find the target component"); 62 throw konforka::exception(CODEPOINT,"can't find the target component");
63 sitecing_path_info.insert(0,component_path,sl,string::npos);
62 component_path.erase(sl); 64 component_path.erase(sl);
63 } 65 }
66 ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
64 action = component_path; 67 action = component_path;
65 action_handler = config.lookup_action_handler(component_path); 68 action_handler = config.lookup_action_handler(component_path);
66 if(action_handler) { 69 if(action_handler) {
67 action = action_handler->action; 70 action = action_handler->action;
68 } 71 }
69 string pwd = dir_name(full_component_path); 72 string pwd = dir_name(full_component_path);
70 if(chdir(pwd.c_str())) 73 if(chdir(pwd.c_str()))
71 throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); 74 throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
72 so_component soc = ss.fetch(action,&scif); 75 so_component soc = ss.fetch(action,&scif);
73 if(action_handler) { 76 if(action_handler) {
74 soc.ac->run(__magic_action, 77 soc.ac->run(__magic_action,
75 config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), 78 config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
76 &(action_handler->args) 79 &(action_handler->args)
77 ); 80 );
78 }else{ 81 }else{
79 soc.ac->main(0,NULL); 82 soc.ac->main(0,NULL);
80 } 83 }
81 }catch(http_status& hs) { 84 }catch(http_status& hs) {
82 scif.headers["Status"] = hs.status+" "+hs.message; 85 scif.headers["Status"] = hs.status+" "+hs.message;
83 string hshp = config.lookup_http_status_handler(component_path,hs.status); 86 string hshp = config.lookup_http_status_handler(component_path,hs.status);
84 if(!hshp.empty()) { 87 if(!hshp.empty()) {
85 so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status 88 so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
86 hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), 89 hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
87 config.root_so.c_str(),action.c_str(),&hs); 90 config.root_so.c_str(),action.c_str(),&hs);
88 } 91 }
89 }catch(compile_error& ce) { 92 }catch(compile_error& ce) {
90 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); 93 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
91 if(co_exception_handler) { 94 if(co_exception_handler) {
92 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. 95 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
93 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()); 96 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());
94 }else{ 97 }else{
95 ce.see(CODEPOINT); 98 ce.see(CODEPOINT);
96 throw; 99 throw;
97 } 100 }
98 }catch(preprocessor_error& pe) { 101 }catch(preprocessor_error& pe) {
99 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); 102 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
100 if(co_exception_handler) { 103 if(co_exception_handler) {
101 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. 104 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
102 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); 105 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);
103 }else{ 106 }else{
104 pe.see(CODEPOINT); 107 pe.see(CODEPOINT);
105 throw; 108 throw;
106 } 109 }
107 }catch(exception& e) { 110 }catch(exception& e) {
108 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); 111 config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
109 if(co_exception_handler) { 112 if(co_exception_handler) {
110 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. 113 so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
111 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); 114 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);
112 } 115 }
113 } 116 }
114 scif.flush(); 117 scif.flush();
115 }catch(exception& e) { 118 }catch(exception& e) {
116 cerr << "->Oops: " << e.what() << endl; 119 cerr << "->Oops: " << e.what() << endl;
117 } 120 }
118} 121}
119 122
120int main(int argc,char **argv) { 123int main(int argc,char **argv) {
121 const char* id = *argv; 124 const char* id = *argv;
122 const char* t; 125 const char* t;
123 while(t = index(id,'/')) { 126 while(t = index(id,'/')) {
124 id=t; id++; 127 id=t; id++;
125 } 128 }
126 openlog(id,LOG_PERROR|LOG_PID,LOG_USER); 129 openlog(id,LOG_PERROR|LOG_PID,LOG_USER);
127 try { 130 try {
128 const char *esccf = getenv("SITECING_CONF"); 131 const char *esccf = getenv("SITECING_CONF");
129 string config_file = esccf ? esccf : "sitecing.conf"; 132 string config_file = esccf ? esccf : "sitecing.conf";
130 while(true) { 133 while(true) {
131 static struct option opts[] = { 134 static struct option opts[] = {
132 { "help", no_argument, 0, 'h' }, 135 { "help", no_argument, 0, 'h' },
133 { "usage", no_argument, 0, 'h' }, 136 { "usage", no_argument, 0, 'h' },
134 { "version", no_argument, 0, 'V' }, 137 { "version", no_argument, 0, 'V' },
135 { "license", no_argument, 0, 'L' }, 138 { "license", no_argument, 0, 'L' },
136 { "config", required_argument, 0, 'f' }, 139 { "config", required_argument, 0, 'f' },
137 { NULL, 0, 0, 0 } 140 { NULL, 0, 0, 0 }
138 }; 141 };
139 int c = getopt_long(argc,argv,"f:hVL",opts,NULL); 142 int c = getopt_long(argc,argv,"f:hVL",opts,NULL);
140 if(c==-1) 143 if(c==-1)
141 break; 144 break;
142 switch(c) { 145 switch(c) {
143 case 'h': 146 case 'h':
144 cerr << PHEADER << endl 147 cerr << PHEADER << endl
145 << PCOPY << endl << endl 148 << PCOPY << endl << endl
146 << " -h, --help" << endl 149 << " -h, --help" << endl
147 << " --usage display this text" << endl 150 << " --usage display this text" << endl
148 << " -V, --version display version number" << endl 151 << " -V, --version display version number" << endl
149 << " -L, --license show license" << endl 152 << " -L, --license show license" << endl
150 << " -f filename, --config=filename" << endl 153 << " -f filename, --config=filename" << endl
151 << " specify configuration file to use" << endl; 154 << " specify configuration file to use" << endl;
152 exit(0); 155 exit(0);
153 break; 156 break;
154 case 'V': 157 case 'V':
155 cerr << VERSION << endl; 158 cerr << VERSION << endl;
156 exit(0); 159 exit(0);
157 break; 160 break;
158 case 'L': 161 case 'L':
159 extern const char *COPYING; 162 extern const char *COPYING;
160 cerr << COPYING << endl; 163 cerr << COPYING << endl;
161 exit(0); 164 exit(0);
162 break; 165 break;
163 case 'f': 166 case 'f':
164 config_file = optarg; 167 config_file = optarg;
165 break; 168 break;
166 default: 169 default:
167 cerr << "Huh??" << endl; 170 cerr << "Huh??" << endl;
168 break; 171 break;
169 } 172 }
170 } 173 }
171 configuration config(config_file); 174 configuration config(config_file);
172 process_request(config); 175 process_request(config);
173 }catch(exception& e) { 176 }catch(exception& e) {
174 /* cerr << "Oops: " << e.what() << endl; */ 177 /* cerr << "Oops: " << e.what() << endl; */
175 syslog(LOG_ERR,"uncaught exception: %s",e.what()); 178 syslog(LOG_ERR,"uncaught exception: %s",e.what());
176 } 179 }
177 closelog(); 180 closelog();
178} 181}