X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=907041ee6395a89e4979b34e71b44bea47c124e5;hb=28a25b1e12775022d456c2a6d312b69b283d942f;hp=6359a0ae353e009e9dcbfc8425c52b1244bf6112;hpb=d4c4b43f0c0a3632998892da7bad8a18e687b0e8;p=shcgi
diff --git a/index.cgi b/index.cgi
index 6359a0a..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.
#
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with shcgi. If not, see .
-export LC_ALL=C
+export LC_ALL=C LANG=C
# 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
@@ -25,49 +25,38 @@ export LC_ALL=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
+export _DATA="$(dirname "$call")" #storage directory
+export _EXEC="${real%/shcgi/index.cgi}" #execution directory
-# basic functions
-die() {
- echo "$@" >&2
- exit 1
-}
+# put debug options in the local.opts file
+. "$_EXEC/shcgi/misc.sh"
+. "$_EXEC/shcgi/debug.sh"
+[ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
-debug() { #change to false to disable debugging
- #true && echo "$*" >>debug
- true && [ -n "$*" ] && echo -E "$*" >>/dev/stderr
- true && [ -z "$*" ] && tee /dev/stderr
-}
-
-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" <