X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=index.cgi;h=319b9be2a986d60a7abc78536716f289a9913604;hp=92ccfd618583b874c3af61879b6b3c6287a2aec8;hb=ab91d360c3edf94cbe18b2f7e372f7c235bea3eb;hpb=456423f02f12ac71d2d14e1abf959dafdc5eb041

diff --git a/index.cgi b/index.cgi
index 92ccfd6..319b9be 100755
--- a/index.cgi
+++ b/index.cgi
@@ -25,31 +25,36 @@ export LC_ALL=C LANG=C
 # therefore we need to identify the code and data directories _EXEC and _DATA
 call="$0"
 real="$(readlink -f $call)"
-_DATA="$(dirname "$call")"  #storage directory
-_EXEC="${real%/shcgi/index.cgi}"  #execution directory
-
-. "$_EXEC/shcgi/misc.sh"
+export _DATA="$(dirname "$call")"  #storage directory
+export _EXEC="${real%/shcgi/index.cgi}"  #execution directory
 
 # put debug options in the local.opts file
+. "$_EXEC/shcgi/misc.sh"
 . "$_EXEC/shcgi/debug.sh"
 [ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
 
+if [ "$1" = '--server' -o  "$1" = '--inetd' -o "$1" = '--ncat' ]; then
+  . "$_EXEC/shcgi/server.sh" $@
+else
+  HTTP_format(){ cat }
+fi
+
 . "$_EXEC/shcgi/cgi.sh"
 
 [ -x "$_EXEC/globals.sh" ] && . "$_EXEC/globals.sh"
 
   PAGE=$(validate   "${PAGE:-${_GET[page]}}"   '[a-zA-Z0-9_-]+' '')
 ACTION=$(validate "${ACTION:-${_GET[action]}}" '[a-zA-Z0-9_-]+' '')
-STATIC=$(validate "${STATIC:-${_GET[static]}}" '[^\.]+' '')
+STATIC=$(invalidate "${STATIC:-${_GET[static]}}" '(^|.*/)\.\./.*' '')
 
-if   [ -n "$PAGE"   -a -x "${_EXEC}/pages/${PAGE}.sh" ]; then
-  . "$_EXEC/shcgi/page.sh"
-elif [ -n "$ACTION" -a -x "${_EXEC}/actions/${ACTION}.sh" ]; then
+if [ -n "$STATIC" ] && [ -e "${_EXEC}/static/${STATIC}" ]; then
+  . "$_EXEC/shcgi/static.sh" "$_EXEC/static/$STATIC"
+elif [ -n "$ACTION" ] && [ -x "${_EXEC}/actions/${ACTION}.sh" ]; then
   . "${_EXEC}/actions/${ACTION}.sh"
-elif [ -n "$STATIC" -a -e "${_EXEC}/static/${STATIC}" ]; then
-  . "$_EXEC/shcgi/static.sh"
+elif   [ -n "$PAGE" ] && [ -x "${_EXEC}/pages/${PAGE}.sh" ]; then
+  . "$_EXEC/shcgi/page.sh"
 else
   printf 'HTTP/1.1 404 Not Found\r\n'
   PAGE=error
-  . "$_EXEC/shcgi/page.sh"
-fi
+  [ -x "${_EXEC}/pages/${PAGE}.sh" ] && . "$_EXEC/shcgi/page.sh"
+fi |HTTP_format $@