X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=index.cgi;h=35795cb14d526829084af30452c8b53808e5534b;hp=fada33d28e5e7a0bcb09a2e462f5e19ce2646023;hb=d849a531488425d7f86afad48eaa98e14956958f;hpb=c4c5b0acdaaa275baa934caeeba960ad12d14c71
diff --git a/index.cgi b/index.cgi
index fada33d..35795cb 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,64 +18,88 @@
# along with shcgi. If not, see .
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
-# programs from the directory in which the real executable resides
-# 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
-
-# put debug options in the local.opts file
-[ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
-
-# basic functions
-debug() { #change to false to disable debugging
- if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
- echo -E "$@" >>"$DBG_FILE"
- elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
- tee -a "$DBG_FILE"
- elif [ -z "$*" ]; then
- cat
- fi
-}
-
-die() {
- debug "$@"
- echo -E "$@" >>/dev/stderr
- exit 1
-}
-
-data_dirs(){
- # create directories for object storage
+if [ "$1" = '--ncat' ]; then
+ export REMOTE_ADDR="${NCAT_REMOTE_ADDR}"
+ export SERVER_NAME="${NCAT_LOCAL_ADDR}"
+ export SERVER_PORT="${NCAT_LOCAL_PORT}"
+else
+ # 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
+ # programs from the directory in which the real executable resides
+ # 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"
+
+ # put debug options in the local.opts file
+ . "$_EXEC/shcgi/debug.sh"
+ [ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
+fi
- [ -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
-}
+if [ "$1" = '--server' ]; then
+ shift 1
+ ncat -kle "$0 --ncat" $@
+ exit $?
-# create htaccess file
-[ -f "$_DATA/.htaccess" ] || cat >"$_DATA/.htaccess" <