author | Michael Krelin <hacker@klever.net> | 2005-02-13 21:48:37 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-02-13 21:48:37 (UTC) |
commit | ace26447603d3f7ecd82fd3910174f603c2c7464 (patch) (unidiff) | |
tree | 3a82346bd7fff177f74424ed61a6a2c6aa7a308e /src | |
parent | 4fa4a0071ef9a04c02f8934b2e1d3b7628a65c80 (diff) | |
download | kingate-ace26447603d3f7ecd82fd3910174f603c2c7464.zip kingate-ace26447603d3f7ecd82fd3910174f603c2c7464.tar.gz kingate-ace26447603d3f7ecd82fd3910174f603c2c7464.tar.bz2 |
portabiity improvements
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/plaincgi.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e5c6778..d516d37 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -1,23 +1,23 @@ | |||
1 | lib_LTLIBRARIES = libkingate.la libkingate-plaincgi.la | 1 | lib_LTLIBRARIES = libkingate.la libkingate-plaincgi.la |
2 | 2 | ||
3 | if HAVE_FCGI | 3 | if HAVE_FCGI |
4 | lib_LTLIBRARIES += libkingate-fcgi.la | 4 | lib_LTLIBRARIES += libkingate-fcgi.la |
5 | endif | 5 | endif |
6 | 6 | ||
7 | INCLUDES = -I${top_srcdir}/include | 7 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir} |
8 | AM_CXXFLAGS = ${KONFORKA_CFLAGS} | 8 | AM_CXXFLAGS = ${KONFORKA_CFLAGS} |
9 | LDADD = ${KONFORKA_LIBS} | 9 | LDADD = ${KONFORKA_LIBS} |
10 | 10 | ||
11 | libkingate_la_SOURCES = \ | 11 | libkingate_la_SOURCES = \ |
12 | cgi_gateway.cc \ | 12 | cgi_gateway.cc \ |
13 | cgi_interface.cc \ | 13 | cgi_interface.cc \ |
14 | util.cc | 14 | util.cc |
15 | libkingate_la_LDFLAGS = -version-info 1:0:0 | 15 | libkingate_la_LDFLAGS = -version-info 1:0:0 |
16 | 16 | ||
17 | libkingate_fcgi_la_SOURCES = \ | 17 | libkingate_fcgi_la_SOURCES = \ |
18 | fastcgi.cc | 18 | fastcgi.cc |
19 | libkingate_fcgi_la_LDFLAGS = -version-info 1:0:0 | 19 | libkingate_fcgi_la_LDFLAGS = -version-info 1:0:0 |
20 | 20 | ||
21 | libkingate_plaincgi_la_SOURCES = \ | 21 | libkingate_plaincgi_la_SOURCES = \ |
22 | plaincgi.cc | 22 | plaincgi.cc |
23 | libkingate_plaincgi_la_LDFLAGS = -version-info 1:0:0 | 23 | libkingate_plaincgi_la_LDFLAGS = -version-info 1:0:0 |
diff --git a/src/plaincgi.cc b/src/plaincgi.cc index 6934748..1cb7dc6 100644 --- a/src/plaincgi.cc +++ b/src/plaincgi.cc | |||
@@ -1,21 +1,26 @@ | |||
1 | #include <unistd.h> | 1 | #include <unistd.h> |
2 | #include <sys/types.h> | 2 | #include <sys/types.h> |
3 | #include <sys/stat.h> | 3 | #include <sys/stat.h> |
4 | #include "kingate/plaincgi.h" | 4 | #include "kingate/plaincgi.h" |
5 | #include "kingate/exception.h" | 5 | #include "kingate/exception.h" |
6 | #include "config.h" | ||
7 | |||
8 | #if !HAVE_DECL_ENVIRON | ||
9 | extern char **environ; | ||
10 | #endif /* HAVE_DECL_ENVIRON */ | ||
6 | 11 | ||
7 | namespace kingate { | 12 | namespace kingate { |
8 | 13 | ||
9 | plaincgi_interface::plaincgi_interface() { | 14 | plaincgi_interface::plaincgi_interface() { |
10 | for(char **p = environ; *p; p++) { | 15 | for(char **p = environ; *p; p++) { |
11 | const char *e = strchr(*p,'='); | 16 | const char *e = strchr(*p,'='); |
12 | if(!e){ | 17 | if(!e){ |
13 | // XXX: check if we have it already? | 18 | // XXX: check if we have it already? |
14 | metavars[*p] = string(0); | 19 | metavars[*p] = string(0); |
15 | }else{ | 20 | }else{ |
16 | int l = e-*p; e++; | 21 | int l = e-*p; e++; |
17 | // XXX: check if we have it already? | 22 | // XXX: check if we have it already? |
18 | metavars[string(*p,l)]=e; | 23 | metavars[string(*p,l)]=e; |
19 | } | 24 | } |
20 | } | 25 | } |
21 | } | 26 | } |