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

diff --git a/index.cgi b/index.cgi
index b407fc1..907041e 100755
--- a/index.cgi
+++ b/index.cgi
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of shcgi.
 # 
@@ -18,8 +18,6 @@
 # along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
 
 export LC_ALL=C LANG=C
-DBG_ENABLED=false
-DBG_FILE=/dev/stderr
 
 # this program is supposed to be symlinked into a http root directory
 # we will use the http root as object storage (data directory) and call sub
@@ -27,55 +25,38 @@ DBG_FILE=/dev/stderr
 # 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
+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"
 
-# basic functions
-debug() { #change to false to disable debugging
-  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
-    printf '%s\n' "$*" >>"$DBG_FILE"
-  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
-    tee -a "$DBG_FILE"
-  elif [ -z "$*" ]; then
-    cat
-  fi
-}
-
-die() {
-  debug FATAL: "$*"
-  printf '%s\n' "$*" >&2
-  exit 1
-}
-
-data_dirs(){
-  # create directories for object storage
-
-  [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable"
-  for each in "$@"; do
-    [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each"
-    [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory"
-  done
-}
-
-# create htaccess file
-[ -f "$_DATA/.htaccess" ] || cat >"$_DATA/.htaccess" <<EOF
-Options		+ExecCGI
-AddHandler	cgi-script .cgi
-DirectoryIndex	index.cgi
-EOF
-[ -f "$_DATA/.htaccess" ] || die "no htaccess file present and unable to create one"
+if [ "$1" = '--server' -o  "$1" = '--inetd' -o "$1" = '--ncat' ]; then
+  . "$_EXEC/shcgi/server.sh" $@
+else
+  HTTP_format(){ cat }
+fi
 
 . "$_EXEC/shcgi/cgi.sh"
 
-cgi_get
+[ -x "$_EXEC/globals.sh" ] && . "$_EXEC/globals.sh"
 
-[ -x "$_EXEC/constants.sh" ] && . "$_EXEC/constants.sh"
+  PAGE=$(validate   "${PAGE:-${_GET[page]}}"   '[a-zA-Z0-9_-]+' '')
+ACTION=$(validate "${ACTION:-${_GET[action]}}" '[a-zA-Z0-9_-]+' '')
+STATIC=$(invalidate "${STATIC:-${_GET[static]}}" '(^|.*/)\.\./.*' '')
 
-if [ -n "${_GET[action]}" ]; then
-  . "$_EXEC/shcgi/action.sh"
-else
+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 "$PAGE" ] && [ -x "${_EXEC}/pages/${PAGE}.sh" ]; then
   . "$_EXEC/shcgi/page.sh"
-fi
+else
+  printf 'Status: 404 Not Found\r\n'
+  PAGE=error
+  [ -x "${_EXEC}/pages/${PAGE}.sh" ] \
+  && . "$_EXEC/shcgi/page.sh" \
+  || printf '\r\n'
+fi |HTTP_format $@