X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=index.cgi;h=907041ee6395a89e4979b34e71b44bea47c124e5;hp=f35a5bde73275203b6df7eef4bed996166cc46d7;hb=1a1d111199b770c092e1b16a7e03568d3d911b79;hpb=67bf6b2b7de1bca9625626a31e5db60d59ad7b7c

diff --git a/index.cgi b/index.cgi
index f35a5bd..907041e 100755
--- a/index.cgi
+++ b/index.cgi
@@ -25,15 +25,20 @@ 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"
@@ -42,14 +47,16 @@ _EXEC="${real%/shcgi/index.cgi}"  #execution directory
 ACTION=$(validate "${ACTION:-${_GET[action]}}" '[a-zA-Z0-9_-]+' '')
 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'
+  printf 'Status: 404 Not Found\r\n'
   PAGE=error
-  . "$_EXEC/shcgi/page.sh"
-fi
+  [ -x "${_EXEC}/pages/${PAGE}.sh" ] \
+  && . "$_EXEC/shcgi/page.sh" \
+  || printf '\r\n'
+fi |HTTP_format $@