X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=907041ee6395a89e4979b34e71b44bea47c124e5;hb=8d60af41a80ea3760dd51c3bc34eab68d88b16ae;hp=b407fc17ea0dcf6d556dba7b5ad5df5eb91189b2;hpb=9b62da2cc5552e018fe8c48360c770446a9a6b55;p=shcgi
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 .
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" <